Changeset 17652 for release-kits/mark3

Timestamp:

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

Author:

oranfry

Message:

started source releases

Location:

release-kits/mark3

Files:

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

release-kits/mark3/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="create-ant-component" />
-        <antcall target="create-tomcat-component" />
+        <antcall target="prepare-components" />
+        <antcall target="compress-components" />
     </target>
 
-    <target name="create-core-component">
+    <!-- 2nd level -->
+    <target name="prepare-components">
         <antcall target="prepare-core-component" />
-        <antcall target="compress-core-component" />
+        <antcall target="prepare-sourcecode-component" />
+        <antcall target="prepare-ant-component" />
+        <antcall target="prepare-tomcat-component" />
+        <antcall target="prepare-sourcecode-core-component" />
     </target>
 
-    <target name="create-sourcecode-component">
-        <antcall target="prepare-sourcecode-component" />
-        <antcall target="compress-sourcecode-component" />  
+    <target name="compress-components">
+        <antcall target="compress-core-component" />
+        <antcall target="compress-sourcecode-component" />
+        <antcall target="compress-ant-component" />
+        <antcall target="compress-tomcat-component" />
+        <antcall target="compress-sourcecode-core-component" />
     </target>
-        
-    <target name="create-ant-component">
-        <antcall target="prepare-ant-component" />
-        <antcall target="compress-ant-component" /> 
-    </target>
-        
-    <target name="create-tomcat-component">
-        <antcall target="prepare-tomcat-component" />
-        <antcall target="compress-tomcat-component" />  
-    </target>
-    
+
+    <!-- 3rd level -->
     <target name="prepare-core-component">
 
@@ -124 +122 @@
         <sevenzip task="encode" input="components/tomcat.comp" output="components/tomcat.lzma" dictionnary="26"/>
     </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="distribution/source">
+                <include name="gli/**/*"/>
+                <include name="docs/**/*"/>
+                <include name="resources/**/*"/>
+                <include name="web/**/*"/>
+                <include name="gs2build/etc/**/*"/>
+                <include name="gs2build/setup.bash"/>
+                <include name="build.xml"/>
+                <include name="build.properties"/>
+                <include name="*.sh"/>
+                <include name="*.txt"/>
+            </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/mark3/ant-scripts/create-distribution.xml

@@ -3 +3 @@
 
     <target name="create-distribution">
+
         <!-- create distribution -->
         <antcall target="export-greenstone3-gli" />
+        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/></antcall>
+        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
+        <antcall target="insert-user-manual"/>
 
-        <antcall target="greenstone3-set-version-numbers">
-            <param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/>
-        </antcall>
-
-        <antcall target="gli-set-version-numbers">
-            <param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/>
-        </antcall>
+        <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
 
         <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
@@ -30 +28 @@
 
         <antcall target="copy-over-build-xml" />
-        <antcall target="insert-user-manual"/>
         <antcall target="insert-compiled-binaries"/>
         <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
-        <antcall target="rename-build-xml-for-transit"/>
-        <antcall target="strip-svn-dirs"><param name="dir" value="distribution/greenstone3"/></antcall> <!-- from init -->
+        <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->
     </target>
 
@@ -44 +40 @@
             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
         </svn>
+        <copy todir="distribution/source"><fileset dir="distribution/greenstone3"/></copy>
     </target>
 

release-kits/mark3/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"/>
+        <!-- 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 bundled components -->
@@ -76 +87 @@
     </page>
 
+    <!-- start bundled components -->
     <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
 
@@ -83 +95 @@
 
     </page>
+    <!-- end bundled components -->
 
     <page type="progress" name="progress" showTargets="true" displayText=""/>

release-kits/mark3/installer/build.xml

@@ -34 +34 @@
         <delete file="core.comp"/>
 
-        <!-- rename greenstone3-build.xml back to build.xml -->
-        <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
-
         <echo message="Setting Binaries to Executable"/>
         <chmod dir="${installDir}" includes="*.sh" perm="775"/>
@@ -63 +60 @@
         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
 
-
-        <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH (no need anymore)-->
-        <!--<echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
-        <exec executable="echo" output="${installDir}/gs3-setup.sh" append="true">
-            <arg line="export ANT_HOME=${installDir}/packages/ant; export PATH=$ANT_HOME/bin:$PATH;"/>
-        </exec>-->
-
-        <!-- delete unneeded files -->      
-        <echo message="Deleting some extraneous files"/>
-        <delete dir="${installDir}/resources/icons"/>
-        <delete file="${installDir}/resources/*.png"/>
-
         <echo>Creating installation properties file</echo>
         <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
@@ -81 +66 @@
 
     </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>Setting up global properties</echo>
+        <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
+        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
+        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
+        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
+
+        <echo>Setting up log4j properties</echo>
+        <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
+        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
+
+        <echo>Creating installation properties file</echo>
+        <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
+
+
+    </target>
+
 
     <!-- Source -->