[Logicampus-cvs] logicampus build.properties, 1.18, 1.19 build.xml, 1.40, 1.41
Brought to you by:
trilexcom
Menu
▾
▴
[Logicampus-cvs] logicampus build.properties, 1.18, 1.19 build.xml, 1.40, 1.41
|
From: Mark K <har...@us...> - 2007-11-02 22:23:25
|
Update of /cvsroot/logicampus/logicampus In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22754 Modified Files: build.properties build.xml Log Message: Finalize win special build. Index: build.xml =================================================================== RCS file: /cvsroot/logicampus/logicampus/build.xml,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** build.xml 27 Sep 2007 15:08:21 -0000 1.40 --- build.xml 2 Nov 2007 22:23:20 -0000 1.41 *************** *** 52,60 **** --> - </target> - - <target name="dist" depends="init" - description="generate an LC dist for Logicampus"> <tarfileset dir="${lcsrc}" prefix="${package.prefix}/logicreate/" id="srcdir" defaultexcludes="yes"> --- 52,56 ---- *************** *** 109,112 **** --- 105,113 ---- </tarfileset> + <tarfileset id="translate" dir="lang" prefix="${package.prefix}/logicreate/lang/"> + <include name="lct.en_US.php"/> + <include name="lct.es_MX.php"/> + <include name="lct.zh_CN.php"/> + </tarfileset> *************** *** 115,118 **** --- 116,124 ---- </tarfileset> + </target> + + + <target name="dist" depends="init" + description="generate an LC dist for Logicampus"> <!-- before files are copied to temp dir, put DB info into defines.php --> *************** *** 137,148 **** <antcall target="translate"/> - <tarfileset id="translate" dir="lang" prefix="${package.prefix}/logicreate/lang/"> - <include name="lct.en_US.php"/> - <include name="lct.es_MX.php"/> - <include name="lct.zh_CN.php"/> - </tarfileset> - - - <tar tarfile="${dist}/logicampus-${lc.version}.tar.gz" compression="gzip"> --- 143,146 ---- *************** *** 159,163 **** <echo message="Tar saved as 'dist/${lc.version}.tar.gz'!" /> - <!-- <zip destfile="${dist}/logicampus-${lc.version}.zip"> <tarfileset refid="srcdir"/> --- 157,160 ---- *************** *** 172,175 **** --- 169,173 ---- </zip> <echo message="Zip saved as 'dist/${lc.version}.zip'!" /> + <!-- --> <delete dir="filtertmp"/> *************** *** 182,211 **** ! <!-- need to recopy images because they shouldn't be filtered by the filterset tag --> ! <!-- ! <copy todir="${build}/public_html/" overwrite="true"> ! <fileset dir="${src}"> ! <include name="templates/private/images/**"/> ! <include name="templates/default/images/**"/> ! <exclude name="templates/**/*CVS*"/> ! <exclude name="templates/**/*~"/> ! </fileset> ! </copy> - <copy todir="${build}/logicreate/"> - <fileset dir="${src}"> - <include name="content/**"/> - <exclude name="content/**/*CVS*"/> - <exclude name="content/**/*~"/> - </fileset> - </copy> ! <copy file="${src}/images/lc-logo.gif" tofile="${build}/public_html/templates/default/images/lc-logo.gif" overwrite="true"/> - --> <!-- apply LCPL to files --> --- 180,262 ---- ! <!-- apply LCPL to files --> ! <!-- ! <antcall target="apply_license"/> ! --> ! <echo message="Archive saved in 'dist/' directory!" /> ! </target> ! <target name="specialwindist" depends="init, specialwininit" ! description="generate an LC dist for window with 7zip installer"> ! ! <!-- before files are copied to temp dir, put DB info into defines.php --> ! <antcall target="setup"/> ! ! <mkdir dir="filtertmp"/> ! <filter token="version.number" value="${version.number}"/> ! <filter token="build.date" value="${build.date}"/> ! <filter token="version.extra" value="${version.extra}"/> ! <copy file="${src}/index.php" todir="filtertmp" filtering="true"/> ! <copy file="${src}/defines.php" todir="filtertmp" filtering="true"/> ! <copy file="${src}/defines.template.php" todir="filtertmp" filtering="true"/> ! <copy file="${src}/settings.advanced.php" todir="filtertmp" filtering="true"/> ! <copy file="${src}/settings.simple.php" todir="filtertmp" filtering="true"/> ! ! <!-- build translation files and install --> ! <antcall target="translate"/> ! ! <!-- copy xampplite zip to dist --> ! <!-- ! --> ! <copy file="win-setup/xamppcampus-win32-1.6.4.zip" todir="${dist}"/> ! ! ! <!-- ! <zip destfile="${dist}/logicampus-${lc.version}.zip"> ! --> ! ! <!-- ! --> ! <antcall target="specialwininit"/> ! <!-- ! --> ! <zip destfile="${dist}/xamppcampus-win32-1.6.4.zip" update="yes"> ! <tarfileset refid="xsrcdir" /> ! <tarfileset refid="xscripts" /> ! <tarfileset refid="xdatadir" /> ! <tarfileset refid="xdatascripts" /> ! <tarfileset refid="xdocs" /> ! <tarfileset refid="xhtml" /> ! <tarfileset refid="xhtmlfilter" /> ! <tarfileset refid="xpatches" /> ! <tarfileset refid="xtranslate" /> ! </zip> ! <echo message="Zip saved as 'dist/xamppcampus-win32-1.6.4.zip'!" /> ! <!-- ! --> ! <delete dir="filtertmp"/> ! <!-- ! --> + <echo message="Starting 7zip compression..." /> + <mkdir dir="7ziptmp"/> + <unzip src="${dist}/xamppcampus-win32-1.6.4.zip" dest="7ziptmp" overwrite="false"/> + <move todir="7ziptmp/logicampus-server-${lc.version}" preservelastmodified="true"> + <fileset dir="7ziptmp/xampplite" /> + </move> + <exec executable="/bin/bash" dir="win-setup" failonerror="true"> + <arg line="compress.sh"/> + <arg line="logicampus-server-${lc.version}"/> + </exec> + + <move file="7ziptmp/logicampus-server-${lc.version}.exe" todir="${dist}" preservelastmodified="true"/> + + <echo message="Cleaning up 7zip temp dir..." /> + <delete dir="7ziptmp"/> <!-- apply LCPL to files --> *************** *** 218,221 **** --- 269,341 ---- + <target name="specialwininit"> + <property name="xampp.prefix" value="xampplite/htdocs" /> + <tarfileset dir="${lcsrc}" prefix="${xampp.prefix}/logicreate/" id="xsrcdir" defaultexcludes="yes"> + <include name="classLibrary/**"/> + <include name="cache/**"/> + <include name="data/**"/> + <include name="lib/**"/> + <include name="services/**"/> + <exclude name="services/unitTest"/> + <include name="content/**"/> + <include name="lang/fallback.php"/> + </tarfileset> + + <tarfileset id="xscripts" dir="${scripts}" prefix="${xampp.prefix}/logicreate/scripts/" defaultexcludes="yes"> + <include name="**"/> + </tarfileset> + + <tarfileset id="xdatascripts" dir="${data}" prefix="${xampp.prefix}/logicreate/scripts/" defaultexcludes="yes"> + <include name="wipe_clean.sh"/> + <include name="install_metainfo.sh"/> + </tarfileset> + + + <tarfileset id="xdatadir" dir="${data}" prefix="${xampp.prefix}/logicreate/data/"> + <include name="*.sql"/> + </tarfileset> + + + <tarfileset id="xdocs" dir="./" prefix="${xampp.prefix}"> + <include name="${docs}license.txt"/> + <include name="${docs}INSTALL" /> + <include name="${docs}SAMPLE_DATA" /> + <include name="README" /> + <include name="LICENSE" /> + <include name="changelog.txt" /> + <include name="changelog.html" /> + </tarfileset> + + + <tarfileset id="xhtml" dir="${src}" prefix="${xampp.prefix}/" > + <include name="herc/**"/> + <include name="htmlarea/**"/> + <exclude name="herc/wysiwyg"/> + <exclude name="herc/content.php" /> + <include name="images/**"/> + <include name="license.txt"/> + <include name="ua.js"/> + <include name="templates/**"/> + <exclude name="templates/*/images/"/> + <include name="install/**"/> + <include name="commentrec/**"/> + </tarfileset> + + <tarfileset id="xhtmlfilter" dir="filtertmp" prefix="${xampp.prefix}/"> + <include name="**"/> + </tarfileset> + + <tarfileset id="xtranslate" dir="lang" prefix="${xampp.prefix}/logicreate/lang/"> + <include name="lct.en_US.php"/> + <include name="lct.es_MX.php"/> + <include name="lct.zh_CN.php"/> + </tarfileset> + + <tarfileset id="xpatches" dir="patches" prefix="${xampp.prefix}/patches"> + <include name="**"/> + </tarfileset> + </target> + + <target name="apply_license" description="uses a combination of bash and perl in the build/ dir to apply a common license to all code files" Index: build.properties =================================================================== RCS file: /cvsroot/logicampus/logicampus/build.properties,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** build.properties 19 Sep 2007 21:06:21 -0000 1.18 --- build.properties 2 Nov 2007 22:23:20 -0000 1.19 *************** *** 1,4 **** ! version.number=2.1.0 ! version.extra=pr2 db.host=localhost db.user=root --- 1,4 ---- ! version.number=3.0.0 ! version.extra=-20071102 db.host=localhost db.user=root |
