Changeset 17652 for release-kits/wirk2

Timestamp:

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

Author:

oranfry

Message:

started source releases

Location:

release-kits/wirk2

Files:

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

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

@@ -2 +2 @@
 <project name="wirk2-create-components" default="create-components">
 
+    <!-- create components from the distribution folder -->
 
+    <!-- 1st level -->
     <target name="create-components">
         <antcall target="prepare-components" />
@@ -8 +10 @@
     </target>
     
-    <!-- create components from the distribution folder -->
+    <!-- 2nd level -->
     <target name="prepare-components">
         <antcall target="prepare-core-component" />
@@ -14 +16 @@
         <antcall target="prepare-ghostscript-component" />
         <antcall target="prepare-sourcecode-component" />
+        <antcall target="prepare-sourcecode-core-component" />
     </target>
     
@@ -21 +24 @@
         <antcall target="compress-ghostscript-component" />
         <antcall target="compress-sourcecode-component" />
+        <antcall target="compress-sourcecode-core-component" />
     </target>
     
-    
-    
-    
+    <!-- 3rd level -->  
     <target name="prepare-core-component">
         <!-- delete old stuff to create new components -->
@@ -121 +123 @@
         <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode.lzma sourcecode.comp"/></exec>
     </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"/>-->
+        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode-core.lzma sourcecode-core.comp"/></exec>
+    </target>
+
     
     

release-kits/wirk2/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="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="drop-in-misc" />
         <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk2-targets -->      
         <antcall target="compile-gli" />
-        <antcall target="tweak-files" />
+        <antcall target="remove-unneeded-files-2" />
+
     </target>
 
@@ -96 +104 @@
         <rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*&lt;input.* name=&quot;gsdl version&quot;.* value=&quot;).*(&quot;.*&gt;)" replacement="$1${version}$2"/>
 
+    </target>
 
-        <echo level="info">Removing signed gatherer</echo>
-        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
-
-        <echo level="info">Removing some unneeded stuff</echo>
+    <target name="remove-unneeded-files-1">
         <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
         <delete dir="${basedir}/distributions/web/bin/linux" />
@@ -107 +113 @@
     </target>
 
+    <target name="remove-unneeded-files-2">
+        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
+    </target>
+
+
 </project>

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

@@ -53 +53 @@
             hidden="true"/>
 
+        <!-- start binary release core -->
         <target
             target="Installing Core System"
             diskRequirement="@component.size.core@"
+            displayText=""
             defaultValue="true"
+            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 -->
 
         <target

release-kits/wirk2/installer/build.xml

@@ -36 +36 @@
     <target name="Installing Core System">
 
-        <!-- figure out the start menu path (if not already set from previous installation) -->
+        <!-- figure out the start menu path -->
         <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>        
         <path id="startmenu.path.path" path="${startmenu.path}"/>
@@ -107 +107 @@
     </target>
 
+    <target name="Installing Source Code Core">
+
+        <!-- figure out the start menu path -->
+        <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>        
+        <path id="startmenu.path.path" path="${startmenu.path}"/>
+        <pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/>
+
+        <echo>basedir: ${basedir}</echo>
+        <echo>installDir: ${installDir}</echo>
+        <echo>antinstaller.jar: ${antinstaller.jar}</echo>
+        <echo>startmenu.path: ${startmenu.path}</echo>
+
+        <!-- create the installation directory -->
+        <echo message="Creating Installation directory"/>
+        <mkdir dir="${installDir}"/>
+        
+        <!-- extract 7za tool -->
+        <unzip src="${antinstaller.jar}" dest="${basedir}">
+            <patternset><include name="7za.exe"/></patternset>
+        </unzip>
+
+        <!-- install files -->
+        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
+        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode-core.lzma"/></exec>
+        <delete file="sourcecode-core.lzma"/>
+        <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
+        <delete file="sourcecode-core.comp"/>
+        
+        <echo message="Filling in concrete values in config files"/>
+        <rsr file="${installDir}/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
+                
+        <echo message="Creating installation properties file"/>
+        <echo file="${installDir}\etc\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
+        
+        <echo message="Finished"/>
+        
+    </target>
+
     <!-- Source -->
     <target name="Installing Source Code">