Changeset 6497

Timestamp:

09/08/06 23:21:19 (5 years ago)

Author:

sam

Message:

Ajout gestion de required="yes/no" sur les éléments d'un model à incorporé ds un installeur

Location:

trunk

Files:

• Bui_Core/resources/packaging/nsis/installer.nsi.xsl (modified) (4 diffs)
• Bui_scBuilder/about.xml (modified) (1 diff)

trunk/Bui_Core/resources/packaging/nsis/installer.nsi.xsl

@@ -43 +43 @@
 
         <xsl:template match="/app">
-        <xsl:if test="count(setup/models/*)&gt;0">
+        <xsl:variable name="vNeedComponentPage" select="count(setup/models/*)&gt;0 and (count(setup/models//@required)=0 or (count(setup/models//@required)&gt;0 and count(setup/models//node()[@required='no'])&gt;0))"/>      
+        
+        <xsl:if test="$vNeedComponentPage='true'">
                 ; Components page setup
                 !define MUI_COMPONENTSPAGE_SMALLDESC
@@ -63 +65 @@
         !insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP
                 
-        <xsl:if test="count(setup/models/*)&gt;0"><!-- si on installe en meme temps un modèle, on insert la fenetre de choix d'installation-->
+        <xsl:if test="$vNeedComponentPage='true'">
                 ; Components page
-; WARNING! disabled temporarely because only SCb uses this.             
-;               !insertmacro MUI_PAGE_COMPONENTS
+                !insertmacro MUI_PAGE_COMPONENTS
         </xsl:if>
                 
@@ -631 +632 @@
                 SectionGroup "$(strSecGrpModTitle_<xsl:value-of select="$vModelCode"/>)" <xsl:value-of select="$vModelCode"/>
                         <xsl:for-each select="package">
-                                Section "$(strSecPackTitle_<xsl:value-of select="concat($vModelCode, position())"/>_mod)" <xsl:value-of select="concat($vModelCode, position())"/>_mod 
+                                Section "<xsl:if test="@required='yes'">-</xsl:if>$(strSecPackTitle_<xsl:value-of select="concat($vModelCode, position())"/>_mod)" <xsl:value-of select="concat($vModelCode, position())"/>_mod 
                                   SetDetailsPrint textonly
                                   DetailPrint "$(strSecPackInstLog_<xsl:value-of select="concat($vModelCode, position())"/>_mod)"
@@ -639 +640 @@
                         </xsl:for-each>
                         <xsl:for-each select="wsp">
-                                Section "$(strSecWspTitle_<xsl:value-of select="concat($vModelCode, position())"/>_wsp)" <xsl:value-of select="concat($vModelCode, position())"/>_wsp 
+                                Section "<xsl:if test="@required='yes'">-</xsl:if>$(strSecWspTitle_<xsl:value-of select="concat($vModelCode, position())"/>_wsp)" <xsl:value-of select="concat($vModelCode, position())"/>_wsp 
                                   SetDetailsPrint textonly
                                   DetailPrint "$(strSecWspInstLog_<xsl:value-of select="concat($vModelCode, position())"/>_wsp)"

trunk/Bui_scBuilder/about.xml

@@ -86 +86 @@
                                         </ant>
                                 -->
-                                <package name="modeling" code="modeling" type="wsppack" ant="${wspdir}/Bui_wspPack/builder/modeling/build.xml" target="All"/> <!-- @type=[wsppack|jar|xpi] -->
+                                <package name="modeling" code="modeling" type="wsppack" required="yes" ant="${wspdir}/Bui_wspPack/builder/modeling/build.xml" target="All"/> <!-- @type=[wsppack|jar|xpi] -->
                                 <!--
                                 <package name="modeling" code="modeling" type="wsppack" dir="C:\scenari_dev3\releases" fileName="modeling1.0.0_RC3_060612-1552.wsppack"/>