Changeset 24076

Show
Ignore:
Timestamp:
20.05.2011 20:32:57 (8 years ago)
Author:
ak19
Message:

Fixed a Windows GS3 compilation bug in the compile-javagdbm ant target where the gs3\src\packages\javagdbm\jni\win32.mak weas expecting GSDL3SRCHOME to find gs2build, but got passed GSDLHOME (gs2build) itself and didn't use it properly, so that compiling gdbmjava failed when gdbmdefs.c (in gs2build) couldn't be located.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r23986 r24076  
    15201520         the "install" argument to copy the gdbmjava.dll into the correct location. --> 
    15211521    <echo>Windows: compile javagdbm</echo> 
     1522    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true">      
     1523      <env key="GSDL3SRCHOME" path="${basedir}"/> 
     1524    </exec> 
    15221525    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true"> 
    1523       <env key="GSDLHOME" path="${gs2build.home}"/> 
    1524     </exec> 
    1525     <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true"> 
    1526       <env key="GSDLHOME" path="${gs2build.home}"/> 
     1526      <env key="GSDL3SRCHOME" path="${basedir}"/> 
    15271527      <arg value="install"/> 
    15281528    </exec>