From e6f315c99b8e8a62bb188c08c4f0bc1cf096874e Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 23 Jan 2011 22:52:07 +0000 Subject: [PATCH] Remove some abortive files from the build, which are no longer used. --- flightgear-release.nsi | 139 ----------------------------------- hudson_build_win_release.bat | 22 ------ 2 files changed, 161 deletions(-) delete mode 100644 flightgear-release.nsi delete mode 100644 hudson_build_win_release.bat diff --git a/flightgear-release.nsi b/flightgear-release.nsi deleted file mode 100644 index 1c1feaf..0000000 --- a/flightgear-release.nsi +++ /dev/null @@ -1,139 +0,0 @@ -!include "MUI.nsh" - -!system 'osgversion --so-number > %TEMP%\osg-so-number.txt' -!system 'osgversion --version-number > %TEMP%\osg-version.txt' - -!define /file OSGSoNumber $%TEMP%\osg-so-number.txt -!define /file OSGVersion $%TEMP%\osg-version.txt -!define /file FGVersion flightgear\version - -!echo "osg-so is ${OSGSoNumber}" - -Name "FlightGear" -OutFile fgfs_win32_${FGVersion}.exe - -; use LZMA for best compression -SetCompressor /FINAL /SOLID lzma -SetCompressorDictSize 64 - -InstallDir $PROGRAMFILES\FlightGear - -; Request admin privileges for Windows Vista -RequestExecutionLevel highest - -; don't hang around -AutoCloseWindow true - -!define UninstallKey "Software\Microsoft\Windows\CurrentVersion\Uninstall\FlightGear" -!define FGBinDir "flightgear\projects\VC90\Win32\Release" -!define FGRunBinDir "fgrun" -!define OSGInstallDir "install\msvc90\OpenSceneGraph" -!define OSGPluginsDir "${OSGInstallDir}\bin\osgPlugins-${OSGVersion}" - -!define ThirdPartyBinDir "3rdParty\bin" - -!define MUI_ICON "flightgear\projects\VC90\flightgear.ico" -!define MUI_UNICON "flightgear\projects\VC90\flightgear.ico" - -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_RIGHT -!define MUI_HEADERIMAGE_BITMAP "flightgear\package\Win-NSIS\fg-install-header.bmp" ; optional - - - -;!define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp" -;!define MUI_UNWELCOMEFINISHPAGE_BITMAP "welcome.bmp" - -!insertmacro MUI_PAGE_WELCOME -; include GPL license page -!insertmacro MUI_PAGE_LICENSE "flightgear\Copying" -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES - -!define MUI_FINISHPAGE_RUN $INSTDIR\fgrun.exe -!define MUI_FINISHPAGE_RUN_TEXT "Run FlightGear now" -!insertmacro MUI_PAGE_FINISH - - -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -!insertmacro MUI_LANGUAGE "English" - -; The stuff to install -Section "" ;No components page, name is not important - - SetShellVarContext all - ; Set output path to the installation directory. - SetOutPath $INSTDIR - - File ${FGBinDir}\fgfs.exe - File ${FGBinDir}\fgjs.exe - File ${FGBinDir}\terrasync.exe - File ${FGRunBinDir}\fgrun.exe - - File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osg.dll - File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgDB.dll - File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgGA.dll - File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgParticle.dll - File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgText.dll - File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgUtil.dll - File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgViewer.dll - File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgSim.dll - File ${OSGInstallDir}\bin\osg${OSGSoNumber}-osgFX.dll - - File ${OSGInstallDir}\bin\ot12-OpenThreads.dll - - File ${ThirdPartyBinDir}\*.dll - - ; VC runtime redistributables - File "$%VCINSTALLDIR%\redist\x86\Microsoft.VC90.CRT\*.dll" - - File /r ${FGRunBinDir}\locale - - SetOutPath $INSTDIR\osgPlugins-${OSGVersion} - File ${OSGPluginsDir}\osgdb_ac.dll - File ${OSGPluginsDir}\osgdb_osg.dll - File ${OSGPluginsDir}\osgdb_3ds.dll - File ${OSGPluginsDir}\osgdb_mdl.dll - File ${OSGPluginsDir}\osgdb_jpeg.dll - File ${OSGPluginsDir}\osgdb_rgb.dll - File ${OSGPluginsDir}\osgdb_png.dll - File ${OSGPluginsDir}\osgdb_txf.dll - - - Exec '"$INSTDIR\fgrun.exe" --silent --fg-exe="$INSTDIR\fgfs.exe" --ts-exe="$INSTDIR\terrasync.exe" ' - - CreateDirectory "$SMPROGRAMS\FlightGear" - CreateShortCut "$SMPROGRAMS\FlightGear\FlightGear.lnk" "$INSTDIR\fgrun.exe" - - - WriteUninstaller "$INSTDIR\FlightGear_Uninstall.exe" - - WriteRegStr HKLM ${UninstallKey} "DisplayName" "FlightGear" - WriteRegStr HKLM ${UninstallKey} "DisplayVersion" "${FGVersion}" - WriteRegStr HKLM ${UninstallKey} "UninstallString" "$INSTDIR\FlightGear_Uninstall.exe" - WriteRegStr HKLM ${UninstallKey} "UninstallPath" "$INSTDIR\FlightGear_Uninstall.exe" - WriteRegDWORD HKLM ${UninstallKey} "NoModify" 1 - WriteRegDWORD HKLM ${UninstallKey} "NoRepair" 1 - WriteRegStr HKLM ${UninstallKey} "URLInfoAbout" "http://www.flightgear.org/" - -SectionEnd - - - -Section "Uninstall" - - SetShellVarContext all - - - Delete "$SMPROGRAMS\FlightGear\FlightGear.lnk" - ; only delete the FlightGear group if it's empty - RMDir "$SMPROGRAMS\FlightGear" - - RMDir /r "$INSTDIR" - - DeleteRegKey HKLM ${UninstallKey} - -SectionEnd - \ No newline at end of file diff --git a/hudson_build_win_release.bat b/hudson_build_win_release.bat deleted file mode 100644 index 9692b80..0000000 --- a/hudson_build_win_release.bat +++ /dev/null @@ -1,22 +0,0 @@ -call "D:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools\vsvars32.bat" - -ECHO #define SIMGEAR_VERSION "2.2.0" > %WORKSPACE%\simgear\simgear\version.h -cd %WORKSPACE%\simgear\projects\VC90 -msbuild SimGear.vcproj /p:Configuration=Release /m - -REM FlightGear - -cd %WORKSPACE%\flightgear -call scripts\tools\version.bat -SET HAVE_VERSION_H=1 -cd %WORKSPACE%\flightgear\projects\VC90 -msbuild FlightGear.sln /p:Configuration=Release /m - - -REM Installer - -cd %WORKSPACE% - - -REM set PATH=%PATH%;C:\Program Files (x86)\NSIS;%WORKSPACE%\install\msvc90\OpenSceneGraph\bin -REM makensis flightgear-release.nsi