Changeset 4043

Show
Ignore:
Timestamp:
02/15/09 02:21:16 (4 years ago)
Author:
rcarvalho
Message:

- Finished Windows Install Script
- Removed unecessary files

Location:
branch/UmitWeb/install_scripts/windows
Files:
2 removed
2 modified

Legend:

Unmodified
Added
Removed
  • branch/UmitWeb/install_scripts/windows/generate_windows_installer.bat

    r3587 r4043  
    88echo Setting installation variables... 
    99set PythonEXE=C:\Python25\python.exe 
    10 set UmitOrig=C:\UMIT\UmitWeb 
     10set UmitOrig=%CD% 
    1111set UmitDir=C:\UmitTemp 
    1212set DistDir=%UmitDir%\dist 
    1313set GTKDir=C:\GTK 
    14 set NmapDir=C:\Nmap 
     14set NmapDir=%PROGRAMFILES%\Nmap 
    1515set WinpcapDir=%PROGRAMFILES%\Winpcap 
    1616set WinInstallDir=%UmitDir%\install_scripts\windows 
     
    2020 
    2121echo Writing output to %Output% 
    22 rd %Output% /S /Q 
     22rd "%Output%" /S /Q 
    2323 
    2424echo Removing old compilation... 
    25 rd %UmitDir% /S /Q 
     25rd "%UmitDir%" /S /Q 
    2626 
    2727echo Creating a temp directory for compilation... 
    28 mkdir %UmitDir% 
     28mkdir "%UmitDir%" 
    2929 
    30 echo Copying trunk to the temp dir... 
    31 xcopy %UmitOrig%\*.* %UmitDir% /E /S /C /Y /V /I >> %Output% 
     30echo Copying UmitWeb to the temp dir... 
     31xcopy "%UmitOrig%\*.*" "%UmitDir%" /E /S /C /Y /V /I >> %Output% 
    3232 
    33 xcopy %UmitOrig%\install_scripts\windows\umit_compiled.nsi %UmitDir% /E /S /C /Y /V /I >> %Output%   
     33xcopy "%UmitOrig%\install_scripts\windows\umit_compiled.nsi" "%UmitDir%" /E /S /C /Y /V /I >> %Output%   
    3434 
    3535echo Creating dist and dist\share directories... 
    36 mkdir %DistDir%\share 
    37 mkdir %DistDir%\share\gtk-2.0 
    38 mkdir %DistDir%\share\gtkthemeselector 
    39 mkdir %DistDir%\share\themes 
    40 mkdir %DistDir%\share\themes\Default 
    41 mkdir %DistDir%\share\themes\MS-Windows 
    42 mkdir %DistDir%\share\xml 
     36mkdir "%DistDir%\share" 
     37mkdir "%DistDir%\share\gtk-2.0" 
     38mkdir "%DistDir%\share\gtkthemeselector" 
     39mkdir "%DistDir%\share\themes" 
     40mkdir "%DistDir%\share\themes\Default" 
     41mkdir "%DistDir%\share\themes\MS-Windows" 
     42mkdir "%DistDir%\share\xml" 
     43mkdir "%DistDir%\etc" 
     44mkdir "%DistDir%\lib" 
    4345 
    4446 
    4547echo Copying GTK's share to dist directory... 
    46 xcopy %GTKDir%\share\gtk-2.0\*.* %DistDir%\share\gtk-2.0\ /S >> %Output% 
     48xcopy "%GTKDir%\share\gtk-2.0\*.*" "%DistDir%\share\gtk-2.0\" /S >> %Output% 
    4749 
    48 xcopy %GTKDir%\share\gtkthemeselector\*.* %DistDir%\share\gtkthemeselector\ /S >> %Output% 
     50xcopy "%GTKDir%\share\gtkthemeselector\*.*" "%DistDir%\share\gtkthemeselector\" /S >> %Output% 
    4951 
    50 xcopy %GTKDir%\share\themes\Default\*.* %DistDir%\share\themes\Default /S >> %Output% 
     52xcopy "%GTKDir%\share\themes\Default\*.*" "%DistDir%\share\themes\Default" /S >> %Output% 
    5153 
    52 xcopy %GTKDir%\share\themes\MS-Windows\*.* %DistDir%\share\themes\MS-Windows /S >> %Output% 
     54xcopy "%GTKDir%\share\themes\MS-Windows\*.*" "%DistDir%\share\themes\MS-Windows" /S >> %Output% 
    5355 
    54 xcopy %GTKDir%\share\xml\*.* %DistDir%\share\xml\ /S >> %Output% 
     56xcopy "%GTKDir%\share\xml\*.*" "%DistDir%\share\xml\" /S >> %Output% 
    5557 
    56 xcopy %GTKDir%\bin\*.dll %UmitDir% /S >> %Output% 
    57  
     58xcopy "%GTKDir%\bin\*.dll" "%UmitDir%" /S >> %Output% 
    5859 
    5960 
    6061echo Creating Nmap dist dirs... 
    61 mkdir %DistDir%\Nmap 
     62mkdir "%DistDir%\Nmap" 
    6263 
    6364 
    6465echo Copying Nmap to his dist directory... 
    65 xcopy %NmapDir%\*.* %DistDir%\Nmap >> %Output% 
     66xcopy "%NmapDir%\*.*" "%DistDir%\Nmap" >> %Output% 
    6667 
    6768 
    6869 
    6970echo Copying setup.py... 
    70 xcopy %WinInstallDir%\setup.py %UmitDir% /Y 
     71xcopy "%WinInstallDir%\setup.py" "%UmitDir%" /Y 
    7172 
    7273 
    7374echo Compiling Umit using py2exe... 
    74 cd %UmitDir% 
    75 %PythonEXE% -OO setup.py py2exe 
     75cd "%UmitDir%" 
     76"%PythonEXE%" -OO setup.py py2exe 
    7677 
    7778 
    7879echo Copying some more GTK files to dist directory... 
    79 xcopy %GTKDir%\lib %DistDir%\lib /S /I >> %Output% 
     80xcopy "%GTKDir%\lib" "%DistDir%\lib" /S /I >> %Output% 
    8081 
    81 xcopy %GTKDir%\etc %DistDir%\etc /S /I >> %Output% 
     82xcopy "%GTKDir%\etc" "%DistDir%\etc" /S /I >> %Output% 
    8283 
    8384 
    8485 
    8586echo Removing the build directory... 
    86 rd %UmitDir%\build /s /q >> %Output% 
     87rd "%UmitDir%\build" /s /q >> %Output% 
    8788 
    8889echo . 
    8990echo Creating installer... 
    90 %MakeNSIS% /P5 /V4 /NOCD %WinInstallDir%\umit_compiled.nsi 
     91%MakeNSIS% /P5 /V4 /NOCD "%WinInstallDir%\umit_compiled.nsi" 
    9192 
    9293 
    93 cd %UmitOrig% 
     94cd "%UmitOrig%" 
    9495echo Done! 
    9596 
  • branch/UmitWeb/install_scripts/windows/umit_compiled.nsi

    r4039 r4043  
    516516  Delete "$INSTDIR\${WINPCAP}" 
    517517   
    518   File "install_scripts\windows\win_dependencies\${NMAP}" 
    519   ExecWait "$INSTDIR\${NMAP} /S" 
    520   Delete "${NMAP}" 
     518  ;File "install_scripts\windows\win_dependencies\${NMAP}" 
     519  ;ExecWait "$INSTDIR\${NMAP} /S" 
     520  ;Delete "${NMAP}" 
    521521   
    522522  Push "$INSTDIR\Nmap\bin"