Changeset 9987

Timestamp:

11/26/07 14:36:39 (4 years ago)

Author:

sam

Message:

Integration postPack Linux dans les buis standard.

Location:

trunk

Files:

• Bui_Core/xPackaging.lin.xml (modified) (3 diffs)
• Bui_postPackLin/deb (moved) (moved from trunk/Bui_postPackLin/ubuntu)
• Bui_postPackLin/deb/README.txt (added)
• Bui_postPackLin/deb/build.xml (copied) (copied from trunk/Bui_postPackLin/ubuntu/build.xml) (2 diffs)
• Bui_postPackLin/deb/properties.xml (copied) (copied from trunk/Bui_postPackLin/ubuntu/properties.xml) (1 diff)
• Bui_postPackLin/deb/resources (copied) (copied from trunk/Bui_postPackLin/ubuntu/resources)
• Bui_postPackLin/deb/scApp (copied) (copied from trunk/Bui_postPackLin/ubuntu/scApp)
• Bui_postPackLin/deb/scBuilder (copied) (copied from trunk/Bui_postPackLin/ubuntu/scBuilder)
• Bui_postPackLin/deb/scBuilder/build.xml (modified) (1 diff)
• Bui_postPackLin/deb/scBuilder/properties.xml (modified) (1 diff)
• Bui_postPackLin/deb/scChain (copied) (copied from trunk/Bui_postPackLin/ubuntu/scChain)
• Bui_postPackLin/deb/scChain/build.xml (modified) (1 diff)
• Bui_postPackLin/deb/scChain/properties.xml (modified) (1 diff)
• Bui_postPackLin/deb/scClient (copied) (copied from trunk/Bui_postPackLin/ubuntu/scClient)
• Bui_postPackLin/deb/scClient/build.xml (modified) (1 diff)
• Bui_postPackLin/deb/scClient/properties.xml (modified) (1 diff)
• Bui_postPackLin/xBuildAllDists.xml (added)
• Bui_scBuilder/_lin/build.xml (modified) (1 diff)
• Bui_scChain/_lin/build.xml (modified) (1 diff)
• Bui_scClient/_lin/build.xml (modified) (1 diff)

trunk/Bui_Core/xPackaging.lin.xml

@@ -55 +55 @@
                                 - app.version(developmentStage);
                                 - destapprootdir
-                                - destinstallerdir
+                                - destinstallerdir | destinstallerfile
                 -->
                 <echo message="Packaging LINUX"/>
@@ -108 +108 @@
                 </copy>
                 
-                <tar compression="gzip" destfile="${destinstallerdir}/${app.name}_${app.version(full)}${app.version(developmentStage)}_${ts}_lin.tgz" >
+                <condition property="destinstallerfile" value="${destinstallerdir}/${app.name}_${app.version(full)}${app.version(developmentStage)}_${ts}_lin.tgz">
+                        <not>
+                                <isset property="destinstallerfile"/>
+                        </not>
+                </condition>
+                <tar compression="gzip" destfile="${destinstallerfile}" >
                   <tarfileset dir="${package.lin.tmpDir}" mode="755">
                     <include name="*.sh"/>
@@ -119 +124 @@
                 <!-- PostProcessing -->
                 <delete dir="${package.lin.tmpDir}"/>
+                <if>
+                        <equals arg1="${os.name}" arg2="Linux"/>
+                        <then>
+                                <property name="app.tgz.path" value="${destinstallerfile}"/>
+                                <ant antfile="${basedir}/../Bui_postPackLin/xBuildAllDists.xml" target="All" inheritall="true" dir="${basedir}/../Bui_postPackLin"/>
+                        </then>
+                </if>
         </target>
         

trunk/Bui_postPackLin/deb/build.xml

@@ -213 +213 @@
 Architecture: ${dist.arch}
 Pre-Depends: bzip2
-Depends: libc6 (>=2.6.1), libportaudio2, openoffice.org (>=2.0.0) | openoffice.org-unbundled (>=2.0.0)${app.depends}
+Depends: libc6 (>=2.4), libportaudio2, openoffice.org (>=2.0.0) | openoffice.org-unbundled (>=2.0.0)${app.depends}
 Recommends: totem-mozilla | mozilla-mplayer
 Suggests: flashplugin-nonfree
@@ -245 +245 @@
                 </exec>
                 <tstamp>
-                        <format property="vDebTs" pattern="yyMMdd-HHmm"/>
+                        <format property="ts" pattern="yyMMdd-HHmm"/>
                 </tstamp>
-                <move file="${app.work.path}/bui.deb" tofile="${releasedir}/${app.name(lowerCase)}_${app.version(dist)}_${dist.arch}_${vDebTs}.deb"/>
+                <move file="${app.work.path}/bui.deb" tofile="${releasedir}/${app.name(lowerCase)}_${app.version(dist)}_${dist.arch}_${ts}.deb"/>
         </target>
 

trunk/Bui_postPackLin/deb/properties.xml

@@ -12 +12 @@
         <property name="dist.maintainer" value="scenari-platform &lt;info@scenari-platform.org&gt;"/>
         <property name="dist.arch" value="i386"/>
-        <property name="dist.version.suffix" value="ubuntu1"/>
+        <property name="dist.version.suffix" value="1"/>
 
 </project>

trunk/Bui_postPackLin/deb/scBuilder/build.xml

@@ -41 +41 @@
 
         <property name="appFolder" value="scBuilder"/>
-        <property name="distName" value="ubuntu"/>
+        <property name="distName" value="deb"/>
 
         <property name="basedir.dist" value="${basedir}/${distName}"/>

trunk/Bui_postPackLin/deb/scBuilder/properties.xml

@@ -10 +10 @@
 
         <!-- = Params globaux ======================================================================== -->
-        <property name="app.tgz.path" value="${basedir}/../../releases/SCENARIbuilder_3.4.0.03_lin.tgz"/>
+        <property name="app.tgz.path" value="${basedir}/../../releases/SCENARIbuilder_lin.tgz"/>
         
         <xmlproperty file="${basedir.dist.app}/about.xml"/>

trunk/Bui_postPackLin/deb/scChain/build.xml

@@ -41 +41 @@
 
         <property name="appFolder" value="scChain"/>
-        <property name="distName" value="ubuntu"/>
+        <property name="distName" value="deb"/>
 
         <property name="basedir.dist" value="${basedir}/${distName}"/>

trunk/Bui_postPackLin/deb/scChain/properties.xml

@@ -10 +10 @@
 
         <!-- = Params globaux ======================================================================== -->
-        <property name="app.tgz.path" value="${basedir}/../../releases/SCENARIchain_3.4.0.03_lin.tgz"/>
+        <property name="app.tgz.path" value="${basedir}/../../releases/SCENARIchain_lin.tgz"/>
         
         <xmlproperty file="${basedir.dist.app}/about.xml"/>

trunk/Bui_postPackLin/deb/scClient/build.xml

@@ -41 +41 @@
 
         <property name="appFolder" value="scClient"/>
-        <property name="distName" value="ubuntu"/>
+        <property name="distName" value="deb"/>
 
         <property name="basedir.dist" value="${basedir}/${distName}"/>

trunk/Bui_postPackLin/deb/scClient/properties.xml

@@ -10 +10 @@
 
         <!-- = Params globaux ======================================================================== -->
-        <property name="app.tgz.path" value="${basedir}/../../releases/SCENARIclient_3.4.0.03_lin.tgz"/>
+        <property name="app.tgz.path" value="${basedir}/../../releases/SCENARIclient_lin.tgz"/>
 
         <xmlproperty file="${basedir.dist.app}/about.xml"/>

trunk/Bui_scBuilder/_lin/build.xml

@@ -50 +50 @@
         <property name="app.os" value="lin"/><!-- [win, lin, mac]-->
         <property name="project.basedir" value="${basedir}\_${app.os}"/>
+        <property name="appFolder" value="scBuilder"/>
                 
         <!-- ressources -->

trunk/Bui_scChain/_lin/build.xml

@@ -10 +10 @@
         <property name="app.os" value="lin"/><!-- [win, lin, mac]-->
         <property name="project.basedir" value="${basedir}/_${app.os}"/>
+        <property name="appFolder" value="scChain"/>
                 
         <!-- ressources -->

trunk/Bui_scClient/_lin/build.xml

@@ -10 +10 @@
         <property name="app.os" value="lin"/><!-- [win, lin, mac]-->
         <property name="project.basedir" value="${basedir}\_${app.os}"/>
+        <property name="appFolder" value="scClient"/>
         
         <!-- ressources -->