Changeset 17652

Timestamp:

2008-10-31 15:08:31 (2 months ago)

Author:

oranfry

Message:

started source releases

Files:

• release-kits/lirk2/ant-scripts/create-distribution.xml (modified) (2 diffs)
• release-kits/lirk3/ant-scripts/create-components.xml (modified) (5 diffs)
• release-kits/lirk3/ant-scripts/create-distribution.xml (modified) (3 diffs)
• release-kits/lirk3/installer/antinstall-config.xml (modified) (3 diffs)
• release-kits/lirk3/installer/build.xml (modified) (3 diffs)
• release-kits/mark2/ant-scripts/create-components.xml (modified) (3 diffs)
• release-kits/mark2/ant-scripts/create-distribution.xml (modified) (3 diffs)
• release-kits/mark2/installer/antinstall-config.xml (modified) (1 diff)
• release-kits/mark2/installer/build.xml (modified) (1 diff)
• release-kits/mark3/ant-scripts/create-components.xml (modified) (2 diffs)
• release-kits/mark3/ant-scripts/create-distribution.xml (modified) (3 diffs)
• release-kits/mark3/installer/antinstall-config.xml (modified) (3 diffs)
• release-kits/mark3/installer/build.xml (modified) (3 diffs)
• release-kits/wirk2/ant-scripts/create-components.xml (modified) (5 diffs)
• release-kits/wirk2/ant-scripts/create-distribution.xml (modified) (3 diffs)
• release-kits/wirk2/installer/antinstall-config.xml (modified) (1 diff)
• release-kits/wirk2/installer/build.xml (modified) (2 diffs)
• release-kits/wirk3/ant-scripts/create-components.xml (modified) (4 diffs)
• release-kits/wirk3/ant-scripts/create-distribution.xml (modified) (2 diffs)
• release-kits/wirk3/installer/antinstall-config.xml (modified) (3 diffs)
• release-kits/wirk3/installer/build.xml (modified) (4 diffs)

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

@@ -11 +11 @@
-                <antcall target="remove-unneeded-files-1" />
-
-
+ <!-- from init -->
-
-                <antcall target="drop-in-binaries" />
@@ -86 +86 @@
-        </target>
-
-        <target name="copy-web-to-source">
-                <copy todir="distributions/source"><fileset dir="distributions/web"/></copy>
-        </target>
-
-        <target name="drop-in-binaries">
-                <echo level="info">Dropping compiled binaries into distribution</echo>

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

@@ -3 +3 @@
-
-        <!-- create components from the distribution folder -->
+
+        <!-- 1st level -->
-        <target name="create-components">
-                <antcall target="prepare-components" />
@@ -8 +10 @@
-        </target>
-
+        <!-- 2nd level -->
-        <target name="prepare-components">
-                <antcall target="prepare-core-component" />
@@ -14 +17 @@
-                <antcall target="prepare-tomcat-component" />
-                <antcall target="prepare-imagemagick-component" />
-
+
-        </target>
-
@@ -23 +26 @@
-                <antcall target="compress-tomcat-component" />
-                <antcall target="compress-imagemagick-component" />
+                <antcall target="compress-sourcecode-core-component" />
-        </target>
-
-
+<!-- 3rd level -->
-        <target name="prepare-core-component">
-
@@ -148 +152 @@
-                <sevenzip task="encode" input="components/imagemagick.comp" output="components/imagemagick.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/lirk3/ant-scripts/create-distribution.xml

@@ -3 +3 @@
-
-        <target name="create-distribution">
+
-                <!-- create distribution -->
-                <antcall target="export-greenstone3-gli" />
-
-
-
-
-
-
+
+
+
-
-
+
+
-                <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
-                        <property name="app.version" value="${version}"/>
@@ -29 +28 @@
-
-                <antcall target="copy-over-build-xml" />
-                <antcall target="insert-user-manual"/>
-                <antcall target="insert-compiled-binaries"/>
-                <antcall target="export-imagemagick-linux-binaries" />
-                <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
-
-
+
+
+
-        </target>
-
@@ -72 +71 @@
-        </target>
-
-        <target name="rename-build-xml-for-transit">
-                <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
-        </target>
-
-</project>

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

@@ -53 +53 @@
-                <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 -->
@@ -90 +101 @@
-        </page>
-
+        <!-- start bundled components -->
-        <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
-
@@ -97 +109 @@
-
-        </page>
+        <!-- end bundled components -->
-
-        <page type="progress" name="progress" showTargets="true" displayText=""/>

release-kits/lirk3/installer/build.xml

@@ -42 +42 @@
-                <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>           
-
-
-                <echo>Renaming greenstone3-build.xml back to build.xml</echo>
-                <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
-
-                <echo>Setting Binaries to Executable</echo>
-                <chmod dir="${installDir}" includes="*.sh" perm="775"/>
@@ -69 +65 @@
-                <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
-
-                <echo>Deleting some unneeded files</echo>
-                <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>
@@ -79 +71 @@
-
-        </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 -->

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

@@ -3 +3 @@
-
-        <!-- create components from the distribution folder -->
+
+        <!-- 1st level -->
-        <target name="create-components">
-
-
+
+
+
+
+
+
+
+
+
-        </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="**/*"/>
-
-
+
+
-                                <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="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="compile-gli" />
-
+
+
-        </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 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"
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-                <!-- 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="">

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

@@ -3 +3 @@
-
-        <!-- create components from the distribution folder -->
+
+        <!-- 1st level -->
-        <target name="create-components">
-
-
-
-
+
+
-        </target>
-
-
+
+
-                <antcall target="prepare-core-component" />
-
+
+
+
+
-        </target>
-
-
-
-
+
+
+
+
+
+
-        </target>
-
-
-
-
-
-
-
-
-
-
-
+
+
-        <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"/>
-
-
-
-
-
-
-
-
+
-
-                <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 -->
-
-
+
-        </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 -->

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>
-        
-
-
-
+
-        <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" />
-            &n