Changeset 16625
- Timestamp:
- 2008-07-31T15:42:23+12:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
greenstone3/trunk/build.xml
r16620 r16625 1307 1307 1308 1308 <target name="unzip-windows-packages" depends="init" if="collection.building.enabled.windows"> 1309 <unzip src="${gs2build.home}/ packages/windows/gdbm/gdbm.zip"1310 dest="${gs2build.home}/ packages/windows/gdbm"/>1311 <unzip src="${gs2build.home}/ packages/windows/crypt/crypt.zip"1312 dest="${gs2build.home}/ packages/windows/crypt"/>1313 <unzip src="${gs2build.home}/ packages/windows/expat/expat.zip"1314 dest="${gs2build.home}/ packages/windows/expat"/>1309 <unzip src="${gs2build.home}/common-src/packages/windows/gdbm/gdbm.zip" 1310 dest="${gs2build.home}/common-src/packages/windows/gdbm"/> 1311 <unzip src="${gs2build.home}/common-src/packages/windows/crypt/crypt.zip" 1312 dest="${gs2build.home}/common-src/packages/windows/crypt"/> 1313 <unzip src="${gs2build.home}/common-src/packages/windows/expat/expat.zip" 1314 dest="${gs2build.home}/common-src/packages/windows/expat"/> 1315 1315 </target> 1316 1316 … … 1343 1343 <target name="install-indexer-files" depends="init" unless="indexers.present"> 1344 1344 <copy todir="${indexers.home}"> 1345 <fileset dir="${gs2build.home}/ indexers" />1345 <fileset dir="${gs2build.home}/common-src/indexers" /> 1346 1346 </copy> 1347 1347 <chmod file="${indexers.home}/configure" perm="a+x"/> … … 1363 1363 </target> 1364 1364 1365 <<<<<<< .mine 1366 <target name="rename-gs2build-files-windows" if="collection.building.enabled.windows"> 1367 <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/> 1368 <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/common-src/src/lib/win32.mak"/> 1369 <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/> 1370 <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/> 1371 </target> 1372 1373 <target name="rename-gs2build-files-unix" if="collection.building.enabled.unix"> 1374 <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/> 1375 <copy file="${gs2build-extra.home}/configure" tofile="${gs2build.home}/configure"/> 1376 <chmod file="${gs2build.home}/configure" perm="a+x"/> 1377 <copy file="${gs2build-extra.home}/configure.in" tofile="${gs2build.home}/configure.in"/> 1378 <copy file="${gs2build-extra.home}/Makefile.in" tofile="${gs2build.home}/Makefile.in"/> 1379 <copy file="${gs2build-extra.home}/packages.configure" tofile="${gs2build.home}/packages/configure"/> 1380 <chmod file="${gs2build.home}/packages/configure" perm="a+x"/> 1381 <copy file="${gs2build-extra.home}/packages.Makefile.in" tofile="${gs2build.home}/packages/Makefile.in"/> 1382 <copy file="${gs2build-extra.home}/lib.Makefile.in" tofile="${gs2build.home}/src/lib/Makefile.in"/> 1383 </target> 1384 1385 ======= 1386 >>>>>>> .r16624 1365 1387 <target name="prepare-gli" depends="init" if="collection.building.enabled" unless="gli.present"> 1366 1388 <antcall target="checkout-gli"/> … … 1479 1501 <target name="install-gs2build-indexers-windows" depends="init" if="collection.building.enabled.windows"> 1480 1502 <copy todir="${gs2build.home}/bin/windows"> 1481 <fileset dir="${gs2build.home}/ indexers/bin">1503 <fileset dir="${gs2build.home}/common-src/indexers/bin"> 1482 1504 <include name="*.*"/> 1483 1505 </fileset>
Note:
See TracChangeset
for help on using the changeset viewer.