Changeset 17652 for release-kits/mark2

Timestamp:

2008-10-31T15:08:31+13:00 (15 years ago)

Author:

oranfry

Message:

started source releases

Location:

release-kits/mark2

Files:

• ant-scripts/create-components.xml (modified) (3 diffs)
• ant-scripts/create-distribution.xml (modified) (3 diffs)
• installer/antinstall-config.xml (modified) (1 diff)
• installer/build.xml (modified) (1 diff)

release-kits/mark2/ant-scripts/create-components.xml

@@ -3 +3 @@
 
     <!-- create components from the distribution folder -->
+
+    <!-- 1st level -->
     <target name="create-components">
-        <antcall target="create-core-component" />
-        <antcall target="create-sourcecode-component" />
+        <antcall target="prepare-components" />
+        <antcall target="compress-components" />
+    </target>
+
+    <!-- 2nd level -->
+    <target name="prepare-components">
+        <antcall target="prepare-core-component" />
+        <antcall target="prepare-sourcecode-component" />
+        <antcall target="prepare-sourcecode-core-component" />
     </target>
     
+    <target name="compress-components">
+        <antcall target="compress-core-component" />
+        <antcall target="compress-sourcecode-component" />
+        <antcall target="compress-sourcecode-core-component" />
+    </target>
+
+    <!-- 3rd level -->
     <target name="create-core-component">
         <antcall target="prepare-core-component" />
@@ -27 +43 @@
                 <include name="**/*"/>
 
-                <!-- sourcecode -->
+                <!-- exclude sourcecode -->
+                <exclude name="common-src"/>
                 <exclude name="common-src/**/*"/>
+                <exclude name="runtime-src"/>
                 <exclude name="runtime-src/**/*"/>
+                <exclude name="build-src"/>
                 <exclude name="build-src/**/*"/>
 
@@ -61 +80 @@
     </target>
     
+    <target name="prepare-sourcecode-core-component">
+        <delete dir="components/tmp/sourcecode-core"/>
+        <mkdir dir="components/tmp/sourcecode-core"/>
+
+        <copy todir="components/tmp/sourcecode-core" overwrite="true">
+            <fileset dir="distributions/source">
+                <include name="macros/**/*"/>
+                <include name="images/**/*"/>
+                <include name="etc/**/*"/>
+                <include name="gli/**/*"/>
+                <include name="collect/**/*"/>
+                <include name="doc/**/*"/>
+                <include name="setup.bash"/>
+            </fileset>
+        </copy>
+        <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
+    </target>
+    
+    <target name="compress-sourcecode-core-component">
+        <sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
+    </target>
+
 </project>

release-kits/mark2/ant-scripts/create-distribution.xml

@@ -3 +3 @@
 
     <target name="create-distribution">
+
         <antcall target="export-gsdl-gli" />
         <antcall target="dist-set-version" />
-        <antcall target="gli-set-version-numbers">
-            <param name="glibasedir" value="${basedir}/distributions/web/gli"/>
-        </antcall>
+        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
+        <antcall target="drop-in-docs" />
+        <antcall target="tweak-files" />
+        <antcall target="remove-unneeded-files-1" />
+
+        <antcall target="copy-web-to-source" /> <!-- from init -->
+
         <antcall target="drop-in-binaries" />
         <antcall target="drop-in-demo-collection" />
-        <antcall target="drop-in-docs" />
         <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
-        <antcall target="insert-export-to-cd-package"/> <!-- from rk2-targets -->
+        <antcall target="insert-export-to-cd-package"/>     <!-- from rk2-targets -->
+        <antcall target="export-imagemagick-linux-binaries" />
         <antcall target="compile-gli" />
-        <antcall target="tweak-files" />
+        <antcall target="remove-unneeded-files-2" />
+
     </target>
 
@@ -24 +30 @@
             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/>
         </svn>
+        <copy todir="distributions/source"><fileset dir="distributions/web"/></copy>
     </target>
 
@@ -105 +112 @@
         <rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*&lt;input.* name=&quot;gsdl version&quot;.* value=&quot;).*(&quot;.*&gt;)" replacement="$1${version}$2"/>
 
-        <echo level="info">Removing signed gatherer</echo>
-        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
+    </target>
 
-        <echo level="info">Removing some unneeded stuff</echo>
+    <target name="remove-unneeded-files-1">
         <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
         <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
         <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
+        <delete dir="${basedir}/distributions/web/common-src/packages/windows"/>
     </target>
 
+    <target name="remove-unneeded-files-2">
+        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
+    </target>
+
+
 </project>

release-kits/mark2/installer/antinstall-config.xml

@@ -45 +45 @@
         <comment name="choose-components"/>
 
+        <!-- start binary release core -->
         <target
             target="Installing Core System"
             diskRequirement="@component.size.core@"
+            displayText=""
             defaultValue="true"
-            force="true"
-            displayText=""/>
+            force="true"/>
+        <!-- end binary release core -->
+
+        <!-- start source release core -->
+        <target
+            target="Installing Source Code Core"
+            diskRequirement="@component.size.sourcecode-core@"
+            displayText=""
+            defaultValue="true"
+            force="true"/>
+        <!-- end source release core -->
 
         <!-- start sourcecode -->

release-kits/mark2/installer/build.xml

@@ -87 +87 @@
     </target>
 
+    <!-- sourcecode core system -->
+    <target name="Installing Source Code Core">
+
+        <echo>Installing Source Code Core</echo>
+        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
+        <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
+        <delete file="sourcecode-core.lzma"/>
+        <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
+        <delete file="sourcecode-core.comp"/>
+
+        <echo>Set the installation locale in config files</echo>
+        <rsr file="${installDir}/setup.bash" pattern="^gsdllang=.*" replacement="gsdllang=${language}"/>
+        <rsr file="${installDir}/gli/gli.sh" pattern="^glilang=.*" replacement="glilang=${language}"/>
+        <rsr file="${installDir}/gli/gems.sh" pattern="^glilang=.*" replacement="glilang=${language}"/>
+
+        <rsr
+            file="${installDir}/gli/classes/xml/config.xml"
+            pattern="(&lt;Argument name=&quot;general.locale&quot;&gt;).*(&lt;/Argument&gt;)"
+            replacement="$1${language}$2"/>
+
+        <echo file="${installDir}/etc/main.cfg" append="true"
+            >cgiarg          shortname=l argdefault=${language}</echo>
+
+        <rsr file="${installDir}/etc/main.cfg" pattern="^status .*" replacement="status enabled"/>
+
+        <echo>Creating installation properties file</echo>
+        <echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo>
+
+    </target>
+
+
+
     <!-- Source -->
     <target name="Installing Source Code" depends="">