diff --git a/FlightGear.iss b/FlightGear.iss index 962d68c..7662436 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -97,6 +97,9 @@ Source: "X:\3rdParty.x64\bin\vcredist_x64.exe"; DestDir: "{app}\bin\Win64"; Flag Source: "X:\3rdParty\bin\oalinst.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion skipifsourcedoesntexist Source: "X:\data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist +; NOTE: tar.gz file uses name 'fgdata', to avoid renaming it, look for both names. +; assuming no setup has both names and hence we don't package twice :) +Source: "X:\fgdata\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32') Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32') diff --git a/hudson_win_package_release.bat b/hudson_win_package_release.bat index 402db03..c214c4b 100644 --- a/hudson_win_package_release.bat +++ b/hudson_win_package_release.bat @@ -10,6 +10,10 @@ REM construct information file to be read by Inno-setup set PATH=%WORKSPACE%\install\msvc100\OpenSceneGraph\bin;%PATH% + +REM add 7-zip to the PATH +set PATH=%PATH%;C:\Program Files\7-zip + REM indirect way to get command output into an environment variable osgversion --so-number > %TEMP%\osg-so-number.txt osgversion --version-number > %TEMP%\osg-version.txt @@ -22,9 +26,11 @@ ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" > InstallConfig.iss ECHO #define OSGVersion "%OSG_VERSION%" >> InstallConfig.iss ECHO #define OSGSoNumber "%OSG_SO_NUMBER%" >> InstallConfig.iss +set DATA_FILE=FlightGear-%FLIGHTGEAR_VERSION%-data + +REM extract the data files +7z e -aoa %DATA_FILE%.tar.bz && 7z x -aoa %DATA_FILE%.tar + REM run Inno-setup! Compil32 /cc FlightGear.iss - - -