Changeset 29232 for other-projects


Ignore:
Timestamp:
08/22/14 17:04:47 (6 years ago)
Author:
ak19
Message:

Correction to syntax error, and checking locations set as env vars actually exist, error checking

Location:
other-projects/expeditee-release-kits
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • other-projects/expeditee-release-kits/create-expeditee.bat

    r29230 r29232  
    11@echo off
    2 ::call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.cmd"
    3 ::call "C:\Program Files\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
     2setlocal
     3
     4:: currentdir (C:\Research\Nightly)
     5set currentdir=%CD%
    46
    57:: Need to edit rke-setup.bat and fill it in with local env vars values
    6 if not exist C:\Research\Nightly\tools\expeditee-release-kits\rke-setup.bat (
     8if not exist %currentdir%\tools\expeditee-release-kits\rke-setup.bat (
    79echo.
    810echo *******************
    911echo.
    10 echo First edit C:\Research\Nightly\tools\expeditee-release-kits\rke-setup.bat.in
    11 echo to generate C:\Research\Nightly\tools\expeditee-release-kits\rke-setup.bat
     12echo First edit %currentdir%\tools\expeditee-release-kits\rke-setup.bat.in
     13echo to generate %currentdir%\tools\expeditee-release-kits\rke-setup.bat
    1214echo.
    1315echo *******************
     
    1820:: rke-setup.bat uses local paths, so cd into expeditee-release-kits first
    1921:: then call rke-setup.bat to source the environment vars it sets
    20 pushd C:\Research\Nightly\tools\expeditee-release-kits
     22pushd %currentdir%\tools\expeditee-release-kits
    2123call rke-setup.bat
     24if ERRORLEVEL 1 (
     25    echo error level 1 or more
     26    popd   
     27    exit /B 1
     28)
    2229popd
    2330
     
    2532:: Make sure the expeditee folder and its rke-build.properties file exist
    2633:: Then run the 'rke' command from snapshots\expeditee
    27 pushd C:\Research\Nightly\snapshots
     34pushd %currentdir%\snapshots
    2835::http://www.robvanderwoude.com/battech_ifexistfolder.php
    2936if not exist expeditee\ mkdir expeditee
    3037if not exist expeditee\rke-build.properties copy C:\Research\Nightly\tools\expeditee-release-kits\rke-build.properties.in expeditee\rke-build.properties
    31 cd expeditee
     38pushd expeditee
    3239rke
    33 popd
     40:: It doesn't reach here for some reason
     41::popd
     42::cd %currentdir%
     43::echo ************** HERE I AM
    3444
    3545:end
     46endlocal
  • other-projects/expeditee-release-kits/rke-setup.bat.in

    r29230 r29232  
    11@echo off
    22
    3 : Example setup file for generating the installer
    4 :   => Copy this to setup.bat, and then edit values below to
    5 :      be meaninful for you own computer setup
     3:: Example setup file for generating the installer
     4::   => Copy this to setup.bat, and then edit values below to
     5::      be meaninful for you own computer setup
    66
    7 : Probably need Visual Studio on your command line as well (need to check)
     7:: Probably need Visual Studio on your command line as well (need to check)
    88
    99
     
    1616
    1717
    18 :: Set VCVars bat file here
     18:: Set Visual Studio environment here by calling vcvars. MS SDK not needed for Expeditee
     19::call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.cmd"
    1920call "C:\Program Files\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
    20 called vcvars
     21echo   Called vcvars 32 bit
    2122
    2223set JAVA_HOME=C:\Program Files\Java\jdk1.8.0
     24if not exist "%JAVA_HOME%\" (
     25    echo ***** JAVA_HOME %JAVA_HOME% does not exist. Set this in %0
     26    exit /B 1
     27)
    2328set PATH=%JAVA_HOME%\bin;%PATH%
    2429echo   Adding in JDK 1.8.1
    2530
    2631set ANT_HOME=C:\cygwin2013\home\davidb\research\packages\ant-1.9.2
     32if not exist "%ANT_HOME%\" (
     33    echo ***** ANT_HOME %ANT_HOME% does not exist. Set this in %0
     34    exit /B 1
     35)
    2736set PATH=%ANT_HOME%\bin;%PATH%
    2837echo   Adding in Ant 1.9
    2938
    3039set "SVN_HOME=C:\Program Files\SlikSvn"
     40if not exist "%SVN_HOME%\" (
     41    echo ***** Can't find SVN in %SVN_HOME%. Set SVN path in %0
     42    exit /B 1
     43)
    3144set PATH=%SVN_HOME%\bin;%PATH%
    3245echo   Adding in Slik SVN 1.8.5
     
    3548echo   Adding RKE scripts into PATH
    3649echo *===
    37 
    3850
    3951echo.
     
    4456echo ****
    4557
     58:end
    4659
    4760
    48 
Note: See TracChangeset for help on using the changeset viewer.