Changeset 17652 for release-kits


Ignore:
Timestamp:
2008-10-31T15:08:31+13:00 (15 years ago)
Author:
oranfry
Message:

started source releases

Location:
release-kits
Files:
21 edited

Legend:

Unmodified
Added
Removed

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

    r17649 r17652  
    1111        <antcall target="remove-unneeded-files-1" />
    1212
    13         <antcall target="copy-web-to-source" />
     13        <antcall target="copy-web-to-source" /> <!-- from init -->
    1414
    1515        <antcall target="drop-in-binaries" />
    … …  
    8686    </target>
    8787
    88     <target name="copy-web-to-source">
    89         <copy todir="distributions/source"><fileset dir="distributions/web"/></copy>
    90     </target>
    91 
    9288    <target name="drop-in-binaries">
    9389        <echo level="info">Dropping compiled binaries into distribution</echo>

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

    r17645 r17652  
    33
    44    <!-- create components from the distribution folder -->
     5
     6    <!-- 1st level -->
    57    <target name="create-components">
    68        <antcall target="prepare-components" />
    … …  
    810    </target>
    911
     12    <!-- 2nd level -->
    1013    <target name="prepare-components">
    1114        <antcall target="prepare-core-component" />
    … …  
    1417        <antcall target="prepare-tomcat-component" />
    1518        <antcall target="prepare-imagemagick-component" />
    16 
     19        <antcall target="prepare-sourcecode-core-component" />
    1720    </target>
    1821
    … …  
    2326        <antcall target="compress-tomcat-component" />
    2427        <antcall target="compress-imagemagick-component" />
     28        <antcall target="compress-sourcecode-core-component" />
    2529    </target>
    2630
    27    
     31    <!-- 3rd level -->
    2832    <target name="prepare-core-component">
    2933
    … …  
    148152        <sevenzip task="encode" input="components/imagemagick.comp" output="components/imagemagick.lzma" dictionnary="26"/>
    149153    </target>
     154
     155    <target name="prepare-sourcecode-core-component">
     156        <delete dir="components/tmp/sourcecode-core"/>
     157        <mkdir dir="components/tmp/sourcecode-core"/>
     158
     159        <copy todir="components/tmp/sourcecode-core" overwrite="true">
     160            <fileset dir="distribution/source">
     161                <include name="gli/**/*"/>
     162                <include name="docs/**/*"/>
     163                <include name="resources/**/*"/>
     164                <include name="web/**/*"/>
     165                <include name="gs2build/etc/**/*"/>
     166                <include name="gs2build/setup.bash"/>
     167                <include name="build.xml"/>
     168                <include name="build.properties"/>
     169                <include name="*.sh"/>
     170                <include name="*.txt"/>
     171            </fileset>
     172        </copy>
     173        <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
     174    </target>
    150175   
     176    <target name="compress-sourcecode-core-component">
     177        <sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
     178    </target>
     179
    151180</project>

  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r17645 r17652  
    33
    44    <target name="create-distribution">
     5
    56        <!-- create distribution -->
    67        <antcall target="export-greenstone3-gli" />
    7         <antcall target="greenstone3-set-version-numbers">
    8             <param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/>
    9         </antcall>
    10         <antcall target="gli-set-version-numbers">
    11             <param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/>
    12         </antcall>
     8        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/></antcall>
     9        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
     10        <antcall target="insert-user-manual"/>
    1311
    14         <!-- create distributions 1, 2 and 3 -->
     12        <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
     13
    1514        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
    1615            <property name="app.version" value="${version}"/>
    … …  
    2928
    3029        <antcall target="copy-over-build-xml" />
    31         <antcall target="insert-user-manual"/>
    3230        <antcall target="insert-compiled-binaries"/>
    3331        <antcall target="export-imagemagick-linux-binaries" />
    3432        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
    35         <antcall target="rename-build-xml-for-transit"/>
    36         <antcall target="strip-svn-dirs"><param name="dir" value="distribution/greenstone3"/></antcall> <!-- from init -->
     33   
     34        <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->
     35
    3736    </target>
    3837
    … …  
    7271    </target>
    7372
    74     <target name="rename-build-xml-for-transit">
    75         <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
    76     </target>
    77 
    7873</project>

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

    r17646 r17652  
    5353        <comment name="choose-components"/>
    5454
     55        <!-- start binary release core -->
    5556        <target
    5657            target="Installing Core System"
    5758            diskRequirement="@component.size.core@"
     59            displayText=""
    5860            defaultValue="true"
     61            force="true"/>
     62        <!-- end binary release core -->
     63
     64        <!-- start source release core -->
     65        <target
     66            target="Installing Source Code Core"
     67            diskRequirement="@component.size.sourcecode-core@"
    5968            displayText=""
     69            defaultValue="true"
    6070            force="true"/>
     71        <!-- end source release core -->
    6172
    6273        <!-- start bundled components -->
    … …  
    90101    </page>
    91102
     103    <!-- start bundled components -->
    92104    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
    93105
    … …  
    97109
    98110    </page>
     111    <!-- end bundled components -->
    99112
    100113    <page type="progress" name="progress" showTargets="true" displayText=""/>

  • release-kits/lirk3/installer/build.xml

    r17646 r17652  
    4242        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
    4343
    44 
    45         <echo>Renaming greenstone3-build.xml back to build.xml</echo>
    46         <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
    47 
    4844        <echo>Setting Binaries to Executable</echo>
    4945        <chmod dir="${installDir}" includes="*.sh" perm="775"/>
    … …  
    6965        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    7066
    71         <echo>Deleting some unneeded files</echo>
    72         <delete dir="${installDir}/resources/icons"/>
    73         <delete file="${installDir}/resources/*.png"/>
    74 
    7567        <echo>Creating installation properties file</echo>
    7668        <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
    … …  
    7971
    8072    </target>
     73
     74    <!-- sourcecode core system -->
     75    <target name="Installing Source Code Core">
     76
     77        <echo>Installing Source Code Core</echo>
     78        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
     79        <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
     80        <delete file="sourcecode-core.lzma"/>
     81        <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
     82        <delete file="sourcecode-core.comp"/>
     83
     84        <echo>Setting up global properties</echo>
     85        <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
     86        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
     87        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
     88        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
     89
     90        <echo>Setting up log4j properties</echo>
     91        <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
     92        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
     93
     94        <echo>Creating installation properties file</echo>
     95        <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
     96
     97    </target>
     98
    8199
    82100    <!-- Source -->

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

    r17453 r17652  
    33
    44    <!-- create components from the distribution folder -->
     5
     6    <!-- 1st level -->
    57    <target name="create-components">
    6         <antcall target="create-core-component" />
    7         <antcall target="create-sourcecode-component" />
     8        <antcall target="prepare-components" />
     9        <antcall target="compress-components" />
     10    </target>
     11
     12    <!-- 2nd level -->
     13    <target name="prepare-components">
     14        <antcall target="prepare-core-component" />
     15        <antcall target="prepare-sourcecode-component" />
     16        <antcall target="prepare-sourcecode-core-component" />
    817    </target>
    918   
     19    <target name="compress-components">
     20        <antcall target="compress-core-component" />
     21        <antcall target="compress-sourcecode-component" />
     22        <antcall target="compress-sourcecode-core-component" />
     23    </target>
     24
     25    <!-- 3rd level -->
    1026    <target name="create-core-component">
    1127        <antcall target="prepare-core-component" />
    … …  
    2743                <include name="**/*"/>
    2844
    29                 <!-- sourcecode -->
     45                <!-- exclude sourcecode -->
     46                <exclude name="common-src"/>
    3047                <exclude name="common-src/**/*"/>
     48                <exclude name="runtime-src"/>
    3149                <exclude name="runtime-src/**/*"/>
     50                <exclude name="build-src"/>
    3251                <exclude name="build-src/**/*"/>
    3352
    … …  
    6180    </target>
    6281   
     82    <target name="prepare-sourcecode-core-component">
     83        <delete dir="components/tmp/sourcecode-core"/>
     84        <mkdir dir="components/tmp/sourcecode-core"/>
     85
     86        <copy todir="components/tmp/sourcecode-core" overwrite="true">
     87            <fileset dir="distributions/source">
     88                <include name="macros/**/*"/>
     89                <include name="images/**/*"/>
     90                <include name="etc/**/*"/>
     91                <include name="gli/**/*"/>
     92                <include name="collect/**/*"/>
     93                <include name="doc/**/*"/>
     94                <include name="setup.bash"/>
     95            </fileset>
     96        </copy>
     97        <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
     98    </target>
     99   
     100    <target name="compress-sourcecode-core-component">
     101        <sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
     102    </target>
     103
    63104</project>

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

    r17523 r17652  
    33
    44    <target name="create-distribution">
     5
    56        <antcall target="export-gsdl-gli" />
    67        <antcall target="dist-set-version" />
    7         <antcall target="gli-set-version-numbers">
    8             <param name="glibasedir" value="${basedir}/distributions/web/gli"/>
    9         </antcall>
     8        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
     9        <antcall target="drop-in-docs" />
     10        <antcall target="tweak-files" />
     11        <antcall target="remove-unneeded-files-1" />
     12
     13        <antcall target="copy-web-to-source" /> <!-- from init -->
     14
    1015        <antcall target="drop-in-binaries" />
    1116        <antcall target="drop-in-demo-collection" />
    12         <antcall target="drop-in-docs" />
    1317        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
    14         <antcall target="insert-export-to-cd-package"/> <!-- from rk2-targets -->
     18        <antcall target="insert-export-to-cd-package"/>     <!-- from rk2-targets -->
     19        <antcall target="export-imagemagick-linux-binaries" />
    1520        <antcall target="compile-gli" />
    16         <antcall target="tweak-files" />
     21        <antcall target="remove-unneeded-files-2" />
     22
    1723    </target>
    1824
    … …  
    2430            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/>
    2531        </svn>
     32        <copy todir="distributions/source"><fileset dir="distributions/web"/></copy>
    2633    </target>
    2734
    … …  
    105112        <rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*&lt;input.* name=&quot;gsdl version&quot;.* value=&quot;).*(&quot;.*&gt;)" replacement="$1${version}$2"/>
    106113
    107         <echo level="info">Removing signed gatherer</echo>
    108         <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
     114    </target>
    109115
    110         <echo level="info">Removing some unneeded stuff</echo>
     116    <target name="remove-unneeded-files-1">
    111117        <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
    112118        <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
    113119        <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
     120        <delete dir="${basedir}/distributions/web/common-src/packages/windows"/>
    114121    </target>
    115122
     123    <target name="remove-unneeded-files-2">
     124        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
     125    </target>
     126
     127
    116128</project>

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

    r17597 r17652  
    4545        <comment name="choose-components"/>
    4646
     47        <!-- start binary release core -->
    4748        <target
    4849            target="Installing Core System"
    4950            diskRequirement="@component.size.core@"
     51            displayText=""
    5052            defaultValue="true"
    51             force="true"
    52             displayText=""/>
     53            force="true"/>
     54        <!-- end binary release core -->
     55
     56        <!-- start source release core -->
     57        <target
     58            target="Installing Source Code Core"
     59            diskRequirement="@component.size.sourcecode-core@"
     60            displayText=""
     61            defaultValue="true"
     62            force="true"/>
     63        <!-- end source release core -->
    5364
    5465        <!-- start sourcecode -->

  • release-kits/mark2/installer/build.xml

    r17611 r17652  
    8787    </target>
    8888
     89    <!-- sourcecode core system -->
     90    <target name="Installing Source Code Core">
     91
     92        <echo>Installing Source Code Core</echo>
     93        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
     94        <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
     95        <delete file="sourcecode-core.lzma"/>
     96        <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
     97        <delete file="sourcecode-core.comp"/>
     98
     99        <echo>Set the installation locale in config files</echo>
     100        <rsr file="${installDir}/setup.bash" pattern="^gsdllang=.*" replacement="gsdllang=${language}"/>
     101        <rsr file="${installDir}/gli/gli.sh" pattern="^glilang=.*" replacement="glilang=${language}"/>
     102        <rsr file="${installDir}/gli/gems.sh" pattern="^glilang=.*" replacement="glilang=${language}"/>
     103
     104        <rsr
     105            file="${installDir}/gli/classes/xml/config.xml"
     106            pattern="(&lt;Argument name=&quot;general.locale&quot;&gt;).*(&lt;/Argument&gt;)"
     107            replacement="$1${language}$2"/>
     108
     109        <echo file="${installDir}/etc/main.cfg" append="true"
     110            >cgiarg          shortname=l argdefault=${language}</echo>
     111
     112        <rsr file="${installDir}/etc/main.cfg" pattern="^status .*" replacement="status enabled"/>
     113
     114        <echo>Creating installation properties file</echo>
     115        <echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo>
     116
     117    </target>
     118
     119
     120
    89121    <!-- Source -->
    90122    <target name="Installing Source Code" depends="">

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

    r17455 r17652  
    33
    44    <!-- create components from the distribution folder -->
     5
     6    <!-- 1st level -->
    57    <target name="create-components">
    6         <antcall target="create-core-component" />
    7         <antcall target="create-sourcecode-component" />
    8         <antcall target="create-ant-component" />
    9         <antcall target="create-tomcat-component" />
     8        <antcall target="prepare-components" />
     9        <antcall target="compress-components" />
    1010    </target>
    1111
    12     <target name="create-core-component">
     12    <!-- 2nd level -->
     13    <target name="prepare-components">
    1314        <antcall target="prepare-core-component" />
    14         <antcall target="compress-core-component" />
     15        <antcall target="prepare-sourcecode-component" />
     16        <antcall target="prepare-ant-component" />
     17        <antcall target="prepare-tomcat-component" />
     18        <antcall target="prepare-sourcecode-core-component" />
    1519    </target>
    1620
    17     <target name="create-sourcecode-component">
    18         <antcall target="prepare-sourcecode-component" />
    19         <antcall target="compress-sourcecode-component" /> 
     21    <target name="compress-components">
     22        <antcall target="compress-core-component" />
     23        <antcall target="compress-sourcecode-component" />
     24        <antcall target="compress-ant-component" />
     25        <antcall target="compress-tomcat-component" />
     26        <antcall target="compress-sourcecode-core-component" />
    2027    </target>
    21        
    22     <target name="create-ant-component">
    23         <antcall target="prepare-ant-component" />
    24         <antcall target="compress-ant-component" />
    25     </target>
    26        
    27     <target name="create-tomcat-component">
    28         <antcall target="prepare-tomcat-component" />
    29         <antcall target="compress-tomcat-component" /> 
    30     </target>
    31    
     28
     29    <!-- 3rd level -->
    3230    <target name="prepare-core-component">
    3331
    … …  
    124122        <sevenzip task="encode" input="components/tomcat.comp" output="components/tomcat.lzma" dictionnary="26"/>
    125123    </target>   
     124
     125    <target name="prepare-sourcecode-core-component">
     126        <delete dir="components/tmp/sourcecode-core"/>
     127        <mkdir dir="components/tmp/sourcecode-core"/>
     128
     129        <copy todir="components/tmp/sourcecode-core" overwrite="true">
     130            <fileset dir="distribution/source">
     131                <include name="gli/**/*"/>
     132                <include name="docs/**/*"/>
     133                <include name="resources/**/*"/>
     134                <include name="web/**/*"/>
     135                <include name="gs2build/etc/**/*"/>
     136                <include name="gs2build/setup.bash"/>
     137                <include name="build.xml"/>
     138                <include name="build.properties"/>
     139                <include name="*.sh"/>
     140                <include name="*.txt"/>
     141            </fileset>
     142        </copy>
     143        <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
     144    </target>
     145   
     146    <target name="compress-sourcecode-core-component">
     147        <sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
     148    </target>
     149
    126150   
    127151</project>

  • release-kits/mark3/ant-scripts/create-distribution.xml

    r17523 r17652  
    33
    44    <target name="create-distribution">
     5
    56        <!-- create distribution -->
    67        <antcall target="export-greenstone3-gli" />
     8        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/></antcall>
     9        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
     10        <antcall target="insert-user-manual"/>
    711
    8         <antcall target="greenstone3-set-version-numbers">
    9             <param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/>
    10         </antcall>
    11 
    12         <antcall target="gli-set-version-numbers">
    13             <param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/>
    14         </antcall>
     12        <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
    1513
    1614        <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
    … …  
    3028
    3129        <antcall target="copy-over-build-xml" />
    32         <antcall target="insert-user-manual"/>
    3330        <antcall target="insert-compiled-binaries"/>
    3431        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
    35         <antcall target="rename-build-xml-for-transit"/>
    36         <antcall target="strip-svn-dirs"><param name="dir" value="distribution/greenstone3"/></antcall> <!-- from init -->
     32        <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->
    3733    </target>
    3834
    … …  
    4440            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
    4541        </svn>
     42        <copy todir="distribution/source"><fileset dir="distribution/greenstone3"/></copy>
    4643    </target>
    4744

  • release-kits/mark3/installer/antinstall-config.xml

    r17597 r17652  
    4545        <comment name="choose-components"/>
    4646
     47        <!-- start binary release core -->
    4748        <target
    4849            target="Installing Core System"
    4950            diskRequirement="@component.size.core@"
     51            displayText=""
    5052            defaultValue="true"
     53            force="true"/>
     54        <!-- end binary release core -->
     55
     56        <!-- start source release core -->
     57        <target
     58            target="Installing Source Code Core"
     59            diskRequirement="@component.size.sourcecode-core@"
    5160            displayText=""
     61            defaultValue="true"
    5262            force="true"/>
     63        <!-- end source release core -->
    5364
    5465        <!-- start bundled components -->
    … …  
    7687    </page>
    7788
     89    <!-- start bundled components -->
    7890    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
    7991
    … …  
    8395
    8496    </page>
     97    <!-- end bundled components -->
    8598
    8699    <page type="progress" name="progress" showTargets="true" displayText=""/>

  • release-kits/mark3/installer/build.xml

    r17609 r17652  
    3434        <delete file="core.comp"/>
    3535
    36         <!-- rename greenstone3-build.xml back to build.xml -->
    37         <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
    38 
    3936        <echo message="Setting Binaries to Executable"/>
    4037        <chmod dir="${installDir}" includes="*.sh" perm="775"/>
    … …  
    6360        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    6461
    65 
    66         <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH (no need anymore)-->
    67         <!--<echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
    68         <exec executable="echo" output="${installDir}/gs3-setup.sh" append="true">
    69             <arg line="export ANT_HOME=${installDir}/packages/ant; export PATH=$ANT_HOME/bin:$PATH;"/>
    70         </exec>-->
    71 
    72         <!-- delete unneeded files -->     
    73         <echo message="Deleting some extraneous files"/>
    74         <delete dir="${installDir}/resources/icons"/>
    75         <delete file="${installDir}/resources/*.png"/>
    76 
    7762        <echo>Creating installation properties file</echo>
    7863        <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
    … …  
    8166
    8267    </target>
     68
     69    <!-- sourcecode core system -->
     70    <target name="Installing Source Code Core">
     71
     72        <echo>Installing Source Code Core</echo>
     73        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
     74        <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
     75        <delete file="sourcecode-core.lzma"/>
     76        <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
     77        <delete file="sourcecode-core.comp"/>
     78
     79        <echo>Setting up global properties</echo>
     80        <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
     81        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
     82        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
     83        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
     84
     85        <echo>Setting up log4j properties</echo>
     86        <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
     87        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
     88
     89        <echo>Creating installation properties file</echo>
     90        <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
     91
     92
     93    </target>
     94
    8395
    8496    <!-- Source -->

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

    r17472 r17652  
    22<project name="wirk2-create-components" default="create-components">
    33
     4    <!-- create components from the distribution folder -->
    45
     6    <!-- 1st level -->
    57    <target name="create-components">
    68        <antcall target="prepare-components" />
    … …  
    810    </target>
    911   
    10     <!-- create components from the distribution folder -->
     12    <!-- 2nd level -->
    1113    <target name="prepare-components">
    1214        <antcall target="prepare-core-component" />
    … …  
    1416        <antcall target="prepare-ghostscript-component" />
    1517        <antcall target="prepare-sourcecode-component" />
     18        <antcall target="prepare-sourcecode-core-component" />
    1619    </target>
    1720   
    … …  
    2124        <antcall target="compress-ghostscript-component" />
    2225        <antcall target="compress-sourcecode-component" />
     26        <antcall target="compress-sourcecode-core-component" />
    2327    </target>
    2428   
    25    
    26    
    27    
     29    <!-- 3rd level --> 
    2830    <target name="prepare-core-component">
    2931        <!-- delete old stuff to create new components -->
    … …  
    121123        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode.lzma sourcecode.comp"/></exec>
    122124    </target>
     125
     126    <target name="prepare-sourcecode-core-component">
     127        <delete dir="components/tmp/sourcecode-core"/>
     128        <mkdir dir="components/tmp/sourcecode-core"/>
     129
     130        <copy todir="components/tmp/sourcecode-core" overwrite="true">
     131            <fileset dir="distributions/source">
     132                <include name="macros/**/*"/>
     133                <include name="images/**/*"/>
     134                <include name="etc/**/*"/>
     135                <include name="gli/**/*"/>
     136                <include name="collect/**/*"/>
     137                <include name="doc/**/*"/>
     138                <include name="setup.bash"/>
     139            </fileset>
     140        </copy>
     141        <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
     142    </target>
     143   
     144    <target name="compress-sourcecode-core-component">
     145        <!--<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>-->
     146        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode-core.lzma sourcecode-core.comp"/></exec>
     147    </target>
     148
    123149   
    124150   

  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r17583 r17652  
    33
    44    <target name="create-distribution">
     5
    56        <antcall target="export-gsdl-gli" />
    67        <antcall target="dist-set-version" />
     8        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
     9        <antcall target="drop-in-docs" />
     10        <antcall target="tweak-files" />
     11        <antcall target="remove-unneeded-files-1" />
     12
     13        <antcall target="copy-web-to-source" /> <!-- from init -->
     14
    715        <antcall target="drop-in-binaries" />
    816        <antcall target="drop-in-demo-collection" />
    9         <antcall target="drop-in-docs" />
    1017        <antcall target="drop-in-misc" />
    1118        <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk2-targets -->     
    1219        <antcall target="compile-gli" />
    13         <antcall target="tweak-files" />
     20        <antcall target="remove-unneeded-files-2" />
     21
    1422    </target>
    1523
    … …  
    96104        <rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*&lt;input.* name=&quot;gsdl version&quot;.* value=&quot;).*(&quot;.*&gt;)" replacement="$1${version}$2"/>
    97105
     106    </target>
    98107
    99         <echo level="info">Removing signed gatherer</echo>
    100         <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
    101 
    102         <echo level="info">Removing some unneeded stuff</echo>
     108    <target name="remove-unneeded-files-1">
    103109        <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
    104110        <delete dir="${basedir}/distributions/web/bin/linux" />
    … …  
    107113    </target>
    108114
     115    <target name="remove-unneeded-files-2">
     116        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
     117    </target>
     118
     119
    109120</project>

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

    r17597 r17652  
    5353            hidden="true"/>
    5454
     55        <!-- start binary release core -->
    5556        <target
    5657            target="Installing Core System"
    5758            diskRequirement="@component.size.core@"
     59            displayText=""
    5860            defaultValue="true"
     61            force="true"/>
     62        <!-- end binary release core -->
     63
     64        <!-- start source release core -->
     65        <target
     66            target="Installing Source Code Core"
     67            diskRequirement="@component.size.sourcecode-core@"
    5968            displayText=""
     69            defaultValue="true"
    6070            force="true"/>
     71        <!-- end source release core -->
    6172
    6273        <target

  • release-kits/wirk2/installer/build.xml

    r17638 r17652  
    3636    <target name="Installing Core System">
    3737
    38         <!-- figure out the start menu path (if not already set from previous installation) -->
     38        <!-- figure out the start menu path -->
    3939        <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>       
    4040        <path id="startmenu.path.path" path="${startmenu.path}"/>
    … …  
    107107    </target>
    108108
     109    <target name="Installing Source Code Core">
     110
     111        <!-- figure out the start menu path -->
     112        <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>       
     113        <path id="startmenu.path.path" path="${startmenu.path}"/>
     114        <pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/>
     115
     116        <echo>basedir: ${basedir}</echo>
     117        <echo>installDir: ${installDir}</echo>
     118        <echo>antinstaller.jar: ${antinstaller.jar}</echo>
     119        <echo>startmenu.path: ${startmenu.path}</echo>
     120
     121        <!-- create the installation directory -->
     122        <echo message="Creating Installation directory"/>
     123        <mkdir dir="${installDir}"/>
     124       
     125        <!-- extract 7za tool -->
     126        <unzip src="${antinstaller.jar}" dest="${basedir}">
     127            <patternset><include name="7za.exe"/></patternset>
     128        </unzip>
     129
     130        <!-- install files -->
     131        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
     132        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode-core.lzma"/></exec>
     133        <delete file="sourcecode-core.lzma"/>
     134        <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
     135        <delete file="sourcecode-core.comp"/>
     136       
     137        <echo message="Filling in concrete values in config files"/>
     138        <rsr file="${installDir}/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
     139               
     140        <echo message="Creating installation properties file"/>
     141        <echo file="${installDir}\etc\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
     142       
     143        <echo message="Finished"/>
     144       
     145    </target>
     146
    109147    <!-- Source -->
    110148    <target name="Installing Source Code">

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

    r17471 r17652  
    22<project name="wirk3-create-components" default="create-components">
    33
    4 
     4    <!-- create components from the distribution folder -->
     5
     6    <!-- 1st level -->
    57    <target name="create-components">
    68        <antcall target="prepare-components" />
    79        <antcall target="compress-components" />
    810    </target>
    9    
    10     <!-- create components from the distribution folder -->
     11
     12    <!-- 2nd level -->
    1113    <target name="prepare-components">
    1214        <antcall target="prepare-core-component" />
    … …  
    1618        <antcall target="prepare-ant-component" />
    1719        <antcall target="prepare-tomcat-component" />
     20        <antcall target="prepare-sourcecode-core-component" />
    1821    </target>
    1922   
    … …  
    2528        <antcall target="compress-ant-component" />
    2629        <antcall target="compress-tomcat-component" />
    27     </target>
    28    
    29    
    30 
    31    
     30        <antcall target="compress-sourcecode-core-component" />
     31    </target
     32   
     33    <!-- 3rd level -->
    3234    <target name="prepare-core-component">
    3335
    … …  
    169171    </target>   
    170172
     173    <target name="prepare-sourcecode-core-component">
     174        <delete dir="components/tmp/sourcecode-core"/>
     175        <mkdir dir="components/tmp/sourcecode-core"/>
     176
     177        <copy todir="components/tmp/sourcecode-core" overwrite="true">
     178            <fileset dir="distribution/source">
     179                <include name="gli/**/*"/>
     180                <include name="docs/**/*"/>
     181                <include name="resources/**/*"/>
     182                <include name="web/**/*"/>
     183                <include name="gs2build/etc/**/*"/>
     184                <include name="gs2build/setup.bash"/>
     185                <include name="build.xml"/>
     186                <include name="build.properties"/>
     187                <include name="*.sh"/>
     188                <include name="*.txt"/>
     189            </fileset>
     190        </copy>
     191        <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
     192    </target>
     193   
     194    <target name="compress-sourcecode-core-component">
     195        <!--<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>-->
     196        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode-core.lzma sourcecode-core.comp"/></exec>
     197    </target>
     198
     199
    171200   
    172201   

  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r17604 r17652  
    33
    44    <target name="create-distribution">
     5
    56        <!-- create distribution -->
    67        <antcall target="export-greenstone3-gli" />
    78        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3" /></antcall>
    89        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli" /></antcall>
     10        <antcall target="insert-user-manual"/>
     11
     12        <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
     13
    914        <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
    1015            <property name="app.version" value="${version}"/>
    … …  
    2328        </ant>
    2429        <antcall target="copy-over-build-xml" />
    25         <antcall target="insert-user-manual"/>
    2630        <antcall target="insert-compiled-binaries"/>
    2731        <antcall target="insert-icon"/>
    2832        <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets -->
    29         <antcall target="rename-build-xml-for-transit"/>
    3033    </target>
    3134

  • release-kits/wirk3/installer/antinstall-config.xml

    r17597 r17652  
    5353            hidden="true"/>
    5454
     55        <!-- start binary release core -->
    5556        <target
    5657            target="Installing Core System"
    5758            diskRequirement="@component.size.core@"
     59            displayText=""
    5860            defaultValue="true"
     61            force="true"/>
     62        <!-- end binary release core -->
     63
     64        <!-- start source release core -->
     65        <target
     66            target="Installing Source Code Core"
     67            diskRequirement="@component.size.sourcecode-core@"
    5968            displayText=""
     69            defaultValue="true"
    6070            force="true"/>
     71        <!-- end source release core -->
    6172
    6273        <target
    … …  
    102113    </page>
    103114
     115    <!-- start bundled components -->
    104116    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
    105117
    … …  
    109121
    110122    </page>
     123    <!-- end bundled components -->
    111124
    112125    <page type="progress" name="progress" showTargets="true" displayText=""/>

  • release-kits/wirk3/installer/build.xml

    r17641 r17652  
    3939    <target name="Installing Core System">
    4040
    41         <!-- figure out the start menu path (if not already set from previous installation) -->
     41        <!-- figure out the start menu path -->
    4242        <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>
    4343        <path id="startmenu.path.path" path="${startmenu.path}"/>
    … …  
    7272        </copy>
    7373
    74         <!-- rename greenstone3-build.xml back to build.xml -->
    75         <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
    76        
    7774        <!-- change the tomcat ports in build.properties -->
    7875        <echo message="Changing tomcat ports in build.properties"/>
    … …  
    104101        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir.unix}/web"/>
    105102
     103        <echo message="Creating installation properties file"/>
     104        <echo file="${installDir}\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
     105       
     106    </target>
     107
     108    <target name="Installing Core System">
     109
     110        <!-- figure out the start menu path -->
     111        <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>
     112        <path id="startmenu.path.path" path="${startmenu.path}"/>
     113        <pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/>
     114               
     115        <echo>basedir: ${basedir}</echo>
     116        <echo>installDir: ${installDir}</echo>
     117        <echo>antinstaller.jar: ${antinstaller.jar}</echo>
     118        <echo>startmenu.path: ${startmenu.path}</echo>
     119       
     120        <!-- create the installation directory -->
     121        <echo message="Creating Installation directory"/>
     122        <mkdir dir="${installDir}"/>
     123
     124        <!-- extract 7za tool -->
     125        <unzip src="${antinstaller.jar}" dest="${basedir}">
     126            <patternset><include name="7za.exe"/></patternset>
     127        </unzip>
     128       
     129        <!-- install files -->
     130        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
     131        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode-core.lzma"/></exec>
     132        <delete file="sourcecode-core.lzma"/>
     133        <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
     134        <delete file="sourcecode-core.comp"/>
     135
     136        <!-- change the tomcat ports in build.properties -->
     137        <echo message="Changing tomcat ports in build.properties"/>
     138        <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
     139        <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
     140        <echo message="Changing tomcat ports in resources/tomcat/server.xml"/>
     141        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/>
     142       
     143        <!-- set gsdlhome in gs2build setup.bat -->
     144        <echo message="Setting %GSDLHOME% in gs2build\setup.bat"/>
     145        <rsr file="${installDir}/gs2build/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir.local}\gs2build" />
     146        <!-- copy the greenstone3.xml file to tomcat -->
     147        <echo message="Copying greenstone3.xml to tomcat directory"/>
     148        <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
     149        <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="@gsdl3webhome@" replacement="${installDir.local}\web" />
     150
     151        <!-- set up global properties -->
     152        <echo message="Setting up global properties"/>
     153        <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
     154        <rsr file="${installDir}/web/WEB-INF/classes/global.properties">
     155            <job pattern="@gsdl3home@" replacement="${installDir.unix}/web" />
     156            <job pattern="@tomcat.server@" replacement="${tomcat.server}" />
     157            <job pattern="@tomcat.port@" replacement="${tomcat.port}" />
     158        </rsr>
     159
     160        <!-- set up log4j properties-->
     161        <echo message="Setting up log4j properties"/>
     162        <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
     163        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir.unix}/web"/>
     164
    106165        <!-- delete unneeded files -->     
    107166        <delete dir="${installDir}/resources/icons"/>
    … …  
    112171       
    113172    </target>
     173
    114174
    115175    <!-- Source -->
Note: See TracChangeset for help on using the changeset viewer.