Changeset 30444


Ignore:
Timestamp:
2016-03-29T15:37:47+13:00 (8 years ago)
Author:
davidb
Message:

Move to newer version of ant needed, for some of the features now used in Greenstone3's build.xml + newer versions of Java

Location:
local/greenstone3/windows-64bit
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • local/greenstone3/windows-64bit/gs3-devel.bat

    r29149 r30444  
    22
    33rem pushd "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC"
    4 pushd "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC"
     4pushd C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC
    55call vcvarsall.bat amd64
    66popd

  • local/greenstone3/windows-64bit/gs3-setup.bat

    r29747 r30444  
    11@echo off
    22
    3 set JAVA_HOME=C:\Program Files\Java\jdk1.7.0_55
     3::set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_45
     4set JAVA_HOME=C:\PROGRA~1\Java\JDK18~1.0_4
    45if not exist "%JAVA_HOME%" (
    56echo %JAVA_HOME% not found. Exiting...
    … …  
    1011echo + Set JAVA_HOME=%JAVA_HOME% and updated PATH
    1112
    12 set ANT_HOME=%CD%\ant-1.8.3
     13::set ANT_HOME=%CD%\ant-1.8.3
     14set ANT_HOME=%CD%\apache-ant-1.9.5
    1315set PATH=%ANT_HOME%\bin;%PATH%
    1416
    … …  
    1618
    1719set PERL_HOME=C:\Perl64
     20::set PERL_HOME=C:\strawberry-perl64\perl
    1821set PATH=%PERL_HOME%\bin;%PATH%
    1922

  • local/greenstone3/windows-64bit/gs3-setup.sh

    r28359 r30444  
    22# Useful when compiling with Cygwin on Windows
    33
    4 export JAVA_HOME=/cygdrive/c/Program\ Files/Java/jdk1.6.0_35
     4export JAVA_HOME=/cygdrive/c/Program\ Files/Java/jdk1.8.0_45
    55export PATH=$JAVA_HOME/bin:$PATH
    66
Note: See TracChangeset for help on using the changeset viewer.