Changeset 17446


Ignore:
Timestamp:
2008-10-02T10:30:18+13:00 (16 years ago)
Author:
oranfry
Message:

got the component scheme working in lirk3

Location:
release-kits/lirk3
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r17422 r17446  
    44    <!-- create components from the distribution folder -->
    55    <target name="create-components">
    6         <antcall target="prepare-to-create-components" />
    76        <antcall target="create-core-component" />
    87        <antcall target="create-sourcecode-component" />
    … …  
    1110    </target>
    1211
    13     <target name="prepare-to-create-components">
    14         <delete dir="components"/>
    15         <mkdir dir="components/tmp"/>
    16     </target>
    17        
    1812    <target name="create-core-component">
    1913        <antcall target="prepare-core-component" />
    … …  
    3832    <target name="prepare-core-component">
    3933
     34        <delete dir="components/tmp/core"/>
    4035        <mkdir dir="components/tmp/core"/>
    4136               
    … …  
    7469   
    7570    <target name="prepare-sourcecode-component">
     71
     72        <delete dir="components/tmp/sourcecode"/>
    7673        <mkdir dir="components/tmp/sourcecode"/>
     74
    7775        <copy todir="components/tmp/sourcecode" overwrite="true">
    7876                <fileset dir="distribution/greenstone3">
    … …  
    9290   
    9391    <target name="prepare-ant-component">
     92
     93        <delete dir="components/tmp/ant"/>
    9494        <mkdir dir="components/tmp/ant"/>
     95
    9596        <copy todir="components/tmp/ant" overwrite="true">
    9697            <fileset dir="distribution/greenstone3/packages">
    … …  
    107108   
    108109    <target name="prepare-tomcat-component">
     110
     111        <delete dir="components/tmp/tomcat"/>
    109112        <mkdir dir="components/tmp/tomcat"/>
     113
    110114        <copy todir="components/tmp/tomcat" overwrite="true">
    111115            <fileset dir="distribution/greenstone3/packages">

  • release-kits/lirk3/ant-scripts/wrap.xml

    r16684 r17446  
    1818        <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/>
    1919        <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
    20         <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3-with-java.jar"/>
    2120
    2221        <!-- substitute the real java installer filename and min version into various files -->
    … …  
    3433        </exec>
    3534        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    36             <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_with_java_jar_start=greenstone3jar --readonly-text greenstone3-with-java.jar greenstone3-with-java.jar.o"/>
    37         </exec>
    38         <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    3935            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
    4036        </exec>
    41 
    4237
    4338        <!-- get size of greenstone.jar -->
    … …  
    4540        <exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    4641
    47         <!-- get size of greenstone-with-java.jar -->
    48         <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3-with-java.jar.ls"><arg line="-l greenstone3-with-java.jar"/></exec>
    49         <exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    50 
    5142        <!-- get size of java -->
    5243        <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
    5344        <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    54 
    55 
    56         <echo level="info">creating the header file for no java version</echo>
    57         <delete file="wrapper.h"/>
    58         <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
    59 
    60         <echo level="info">compile the wrapper program</echo>
    61         <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    62             <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
    63         </exec>
    6445
    6546        <echo level="info">compile libsearch4j</echo>
    … …  
    6849        </exec>
    6950
    70         <echo level="info">link, bundling the files to be bundled</echo>
    71         <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    72             <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o"/>
    73         </exec>
    74 
    75 
    7651        <echo level="info">creating the header file for bundled java version</echo>
    7752        <delete file="wrapper.h"/>
    78         <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
     53        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
    7954        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
    8055        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
    … …  
    8762        <echo level="info">relink, bundling the files to be bundled</echo>
    8863        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    89             <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone3-with-java.jar.o java.o"/>
     64            <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o java.o"/>
    9065        </exec>
    9166

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

    r17444 r17446  
    2828        <!-- install files -->
    2929        <echo>Installing Core Files</echo>
    30         <unzip src="${antinstaller.jar}" dest="${installDir}">
    31             <patternset>
    32                 <include name="bin/**/*"/>
    33                 <include name="docs/**/*"/>
    34                 <include name="gli/**/*"/>
    35                 <include name="gs2build/**/*"/>
    36                 <exclude name="gs2build/common-src/**/*"/>
    37                 <exclude name="gs2build/build-src/**/*"/>
    38                 <exclude name="gs2build/runtime-src/**/*"/>
    39                 <include name="lib/**/*"/>
    40                 <include name="web/**/*"/>
    41                 <include name="resources/**/*"/>
    42 
    43                 <include name="greenstone3-build.xml"/>
    44                 <include name="build.properties"/>
    45                 <include name="gs3-server.sh"/>
    46                 <include name="gs3-setup.sh"/>
    47                 <include name="LICENSE.txt"/>
    48                 <include name="README.txt"/>
    49                 <include name="server.jar"/>
    50                 <include name="Uninstall.jar"/>
    51             </patternset>
    52         </unzip>
    53         <echo/>
     30        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
     31        <sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/>
     32        <delete file="core.lzma"/>
     33        <unzip src="${basedir}/core.comp" dest="${installDir}"/>
     34        <delete file="core.comp"/>
    5435
    5536        <!-- jre -->
     37        <mkdir dir="packages"/>
    5638        <move todir="${installDir}/packages/jre">
    5739            <fileset dir="../@linux-java.extracted@"/>
    … …  
    10183
    10284        <echo>Installing Source Code</echo>
    103         <mkdir dir="${installDir}/src"/>
    104         <unzip src="${antinstaller.jar}" dest="${installDir}">
    105             <patternset>
    106                 <include name="src/**/*"/>
    107                 <include name="gs2build/common-src/**/*"/>
    108                 <include name="gs2build/build-src/**/*"/>
    109                 <include name="gs2build/runtime-src/**/*"/>
    110             </patternset>
    111         </unzip>
     85        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
     86        <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
     87        <delete file="sourcecode.lzma"/>
     88        <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
     89        <delete file="sourcecode.comp"/>
     90
     91
    11292    </target>
    11393
    11494    <target name="install-tomcat">
    11595        <echo>Installing Tomcat (packages/tomcat)</echo>
    116         <unzip src="${antinstaller.jar}" dest="${installDir}">
    117             <patternset>
    118                 <include name="packages/tomcat/**/*"/>
    119             </patternset>
    120         </unzip>
     96        <mkdir dir="packages"/>
     97        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="tomcat.lzma"/></patternset></unzip>
     98        <sevenzip task="decode" input="${basedir}/tomcat.lzma" output="${basedir}/tomcat.comp"/>
     99        <delete file="tomcat.lzma"/>
     100        <unzip src="${basedir}/tomcat.comp" dest="${installDir}/packages"/>
     101        <delete file="tomcat.comp"/>
     102
    121103        <echo>Changing tomcat ports tomcat's server.xml</echo>
    122104        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
    … …  
    135117    <target name="install-ant">
    136118        <echo>Installing Ant (packages/ant)</echo>
    137         <unzip src="${antinstaller.jar}" dest="${installDir}">
    138             <patternset>
    139                 <include name="packages/ant/**/*"/>
    140             </patternset>
    141         </unzip>
     119        <mkdir dir="packages"/>
     120        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ant.lzma"/></patternset></unzip>
     121        <sevenzip task="decode" input="${basedir}/ant.lzma" output="${basedir}/ant.comp"/>
     122        <delete file="ant.lzma"/>
     123        <unzip src="${basedir}/ant.comp" dest="${installDir}/packages"/>
     124        <delete file="ant.comp"/>
     125
    142126        <echo>Setting ant binaries to executable</echo>
    143127        <chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/>
Note: See TracChangeset for help on using the changeset viewer.