Changeset 17652 for release-kits/wirk3

Timestamp:

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

Author:

oranfry

Message:

started source releases

Location:

release-kits/wirk3

Files:

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

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

@@ -2 +2 @@
 <project name="wirk3-create-components" default="create-components">
 
-
+    <!-- create components from the distribution folder -->
+
+    <!-- 1st level -->
     <target name="create-components">
         <antcall target="prepare-components" />
         <antcall target="compress-components" />
     </target>
-    
-    <!-- create components from the distribution folder -->
+
+    <!-- 2nd level -->
     <target name="prepare-components">
         <antcall target="prepare-core-component" />
@@ -16 +18 @@
         <antcall target="prepare-ant-component" />
         <antcall target="prepare-tomcat-component" />
+        <antcall target="prepare-sourcecode-core-component" />
     </target>
     
@@ -25 +28 @@
         <antcall target="compress-ant-component" />
         <antcall target="compress-tomcat-component" />
-    </target>
-    
-    
-
-    
+        <antcall target="compress-sourcecode-core-component" />
+    </target
+    
+    <!-- 3rd level -->
     <target name="prepare-core-component">
 
@@ -169 +171 @@
     </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"/>-->
+        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode-core.lzma sourcecode-core.comp"/></exec>
+    </target>
+
+
     
     

release-kits/wirk3/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="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
+
         <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
             <property name="app.version" value="${version}"/>
@@ -23 +28 @@
         </ant>
         <antcall target="copy-over-build-xml" />
-        <antcall target="insert-user-manual"/>
         <antcall target="insert-compiled-binaries"/>
         <antcall target="insert-icon"/>
         <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets -->
-        <antcall target="rename-build-xml-for-transit"/>
     </target>
 

release-kits/wirk3/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
@@ -102 +113 @@
     </page>
 
+    <!-- start bundled components -->
     <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
 
@@ -109 +121 @@
 
     </page>
+    <!-- end bundled components -->
 
     <page type="progress" name="progress" showTargets="true" displayText=""/>

release-kits/wirk3/installer/build.xml

@@ -39 +39 @@
     <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}"/>
@@ -72 +72 @@
         </copy>
 
-        <!-- rename greenstone3-build.xml back to build.xml -->
-        <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
-        
         <!-- change the tomcat ports in build.properties -->
         <echo message="Changing tomcat ports in build.properties"/>
@@ -104 +101 @@
         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir.unix}/web"/>
 
+        <echo message="Creating installation properties file"/>
+        <echo file="${installDir}\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
+        
+    </target>
+
+    <target name="Installing Core System">
+
+        <!-- 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"/>
+
+        <!-- change the tomcat ports in build.properties -->
+        <echo message="Changing tomcat ports in build.properties"/>
+        <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
+        <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
+        <echo message="Changing tomcat ports in resources/tomcat/server.xml"/>
+        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/>
+        
+        <!-- set gsdlhome in gs2build setup.bat -->
+        <echo message="Setting %GSDLHOME% in gs2build\setup.bat"/>
+        <rsr file="${installDir}/gs2build/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir.local}\gs2build" />
+        <!-- copy the greenstone3.xml file to tomcat -->
+        <echo message="Copying greenstone3.xml to tomcat directory"/>
+        <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
+        <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="@gsdl3webhome@" replacement="${installDir.local}\web" />
+
+        <!-- set up global properties -->
+        <echo message="Setting up global properties"/>
+        <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">
+            <job pattern="@gsdl3home@" replacement="${installDir.unix}/web" />
+            <job pattern="@tomcat.server@" replacement="${tomcat.server}" />
+            <job pattern="@tomcat.port@" replacement="${tomcat.port}" />
+        </rsr>
+
+        <!-- set up log4j properties-->
+        <echo message="Setting up log4j properties"/>
+        <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="${installDir.unix}/web"/>
+
         <!-- delete unneeded files -->      
         <delete dir="${installDir}/resources/icons"/>
@@ -112 +171 @@
         
     </target>
+
 
     <!-- Source -->