Changeset 31427

Show
Ignore:
Timestamp:
17.02.2017 20:49:38 (3 years ago)
Author:
ak19
Message:

Renaming devel batch that sets up environment for GS2 SVN compilation back to setup.bat

Location:
local/greenstone2/windows-64bit
Files:
1 removed
1 modified

Legend:

Unmodified
Added
Removed
  • local/greenstone2/windows-64bit/setup.bat

    r31424 r31427  
    11@echo off 
    22echo. 
    3 echo ****************************** 
     3echo ** 
    44 
    5 :: For notes on compiling GS2 on 64 bit Win 7 see  
     5:: There used to be a race condition when compiling apache httpd that caused GS2 compilation to fail. 
     6:: See the notes on compiling GS2 on 64 bit Win 7 at 
    67:: http://wiki.greenstone.org/doku.php?id=en:developer:compiling_apache&#compiling_the_apache-httpd_included_with_gs2_on_64_bit_windows_7 
     8:: Sam fixed this for the release-kit with http://trac.greenstone.org/changeset/22490 
     9:: while it's at last been fixed in the svn version with commit 31425 (building on flawed earlier attempts in commits 31421 and 31422). 
     10 
     11:: Get the strawberry perl we use for GS from http://trac.greenstone.org/browser/main/trunk/release-kits/shared/windows/perl.zip?rev=head 
     12:: this is referred to below as strawberry-perl32no64 
    713 
    814set JAVA_HOME=C:\Program Files\Java\jdk1.7.0_55 
    915if not exist "%JAVA_HOME%" echo %JAVA_HOME% does not exist& goto done 
    10 set PATH=%JAVA_HOME%\bin;%PATH% 
     16 
     17set PERL_HOME=C:\strawberry-perl32no64\perl 
     18if not exist "%PERL_HOME%" echo %PERL_HOME% does not exist& goto done 
     19 
     20set PATH=%JAVA_HOME%\bin;%PERL_HOME%\bin;C:\Program Files\SlikSvn\bin;%PATH% 
     21 
    1122 
    1223echo + Set JAVA_HOME=%JAVA_HOME% and updated PATH 
    13  
    14 set PERL_HOME=C:\Perl64 
    15 if not exist "%PERL_HOME%" echo %PERL_HOME% does not exist& goto done 
    16 set PATH=%PERL_HOME%\bin;%PATH% 
    17  
    1824echo + Set PERL_PATH=%PERL_HOME% and updated PATH 
    1925 
    20 :: Setup Visual Studio env 
    2126 
    22 :: Running VS in 64 bit mode doesn't work, need to run in 32 bit mode. 
     27:: Microsoft SDK no longer needed. Used to be needed only if compiling GS2 with debugging on, 
     28:: but regular compiling (without debugging on) will also work with MS SDK environment. 
     29rem set sdklocation=C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin 
     30rem if not exist "%sdklocation%" echo %sdklocation% does not exist& goto done 
     31rem pushd "%sdklocation%" 
     32rem call "SetEnv.Cmd" 
     33rem popd 
     34 
     35 
     36 
     37:: Set up Visual MS Studio env  needed to compile GS2. 
     38:: Running VS in 64 bit mode doesn't work, need to run in 32 bit mode.  
     39:: (It may be apache httpd that needs 32 bit mode to compile.) 
    2340:: For now only VS9.0 (VS2008) works 
    24 :: call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools\vsvars32.bat" 
    2541set vslocation=C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools 
    2642if not exist "%vslocation%" echo %vslocation% does not exist& goto done 
     
    2945popd 
    3046 
     47:done 
     48echo Leaving local/setup.bat 
     49echo ****************************** 
     50echo. 
     51 
     52 
     53:: ********************************************************************************** 
     54:: Porting further remarks and attempted code from older version of setup.bat file 
     55:: ********************************************************************************** 
    3156:: VS10 fails: Common Tools folder not found for VS10 
    3257rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat" 
     
    5479::call SetEnv.cmd /x64 
    5580::popd 
    56  
    57  
    58  
    59 :done 
    60 echo Leaving local/setup.bat 
    61 echo ****************************** 
    62 echo. 
    63