Permalink
Browse files

renming and reordering packaging for windows

  • Loading branch information...
tzimmermann committed Mar 13, 2012
1 parent 28eaeb5 commit cf2c48d4ab4ec4aeefa95dc5534eedfd9e42640d
View
@@ -9,5 +9,7 @@ project.xcworkspace/
# Windows
/client/kernelmode/Windows/objchk_win7_x86
-/client/kernelmode/Windows/bin/i386/send_callout.sys
-/client/kernelmode/Windows/bin/i386/send_callout.pdb
+/client/kernelmode/Windows/bin/i386/*.sys
+/client/kernelmode/Windows/bin/i386/*.pdb
+/client/kernelmode/Windows/*.obj
+/client/kernelmode/Windows/*.exe
@@ -1,23 +1,23 @@
[Files]
; copy the TrustRouter module incl. security sub-module
-Source: "usermode\trustrouter\*"; DestDir: "{app}\python\Lib\site-packages\trustrouter"
-Source: "usermode\trustrouter\security\*"; DestDir: "{app}\python\Lib\site-packages\trustrouter\security"; Flags: recursesubdirs
-Source: "usermode\service.py"; DestDir: "{app}\bin"
-Source: "usermode\winservice.py"; DestDir: "{app}\bin"
+Source: "..\..\usermode\trustrouter\*"; DestDir: "{app}\python\Lib\site-packages\trustrouter"
+Source: "..\..\usermode\trustrouter\security\*"; DestDir: "{app}\python\Lib\site-packages\trustrouter\security"; Flags: recursesubdirs
+Source: "..\..\usermode\service.py"; DestDir: "{app}\bin"
+Source: "..\..\usermode\winservice.py"; DestDir: "{app}\bin"
; copy the callout driver
-Source: kernelmode\windows\bin\i386\trustrtr.inf; DestDir: {app}\driver
-Source: kernelmode\windows\bin\i386\trustrtr.sys; DestDir: {app}\driver
+Source: ..\..\kernelmode\windows\bin\i386\trustrtr.inf; DestDir: {app}\driver
+Source: ..\..\kernelmode\windows\bin\i386\trustrtr.sys; DestDir: {app}\driver
; copy program to install windows filtering platform drivers
-Source: "kernelmode\windows\installWFPFilter.exe"; DestDir: {app}\driver; Flags: deleteafterinstall
+Source: "..\..\kernelmode\windows\installWFPFilter.exe"; DestDir: {app}\driver; Flags: deleteafterinstall
; copy Python32 installation directory and the .dlls needed by PyWin
-Source: "packaging\Windows\Python32\*"; DestDir: {app}\python; Flags: recursesubdirs
-Source: "packaging\Windows\pywinddls\*"; DestDir: {sys}
+Source: "Python32\*"; DestDir: {app}\python; Flags: recursesubdirs
+Source: "pywinddls\*"; DestDir: {sys}
; the visual c++ runtime is needed by the security module
-Source: "packaging\Windows\vcredist_x86.exe"; DestDir: {app}; Flags: deleteafterinstall
+Source: "vcredist_x86.exe"; DestDir: {app}; Flags: deleteafterinstall
[Run]
Filename: {app}\vcredist_x86.exe; Parameters: /q /norestart; StatusMsg: "Installing Visual C++ Runtime..."

0 comments on commit cf2c48d

Please sign in to comment.