Updated installer generation since the build directories changed

freelan-developers · Nov 1, 2013 · 5c28d9c · 5c28d9c
1 parent ed83d68
commit 5c28d9c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/packaging/windows/README.md b/packaging/windows/README.md
@@ -4,3 +4,5 @@ Installers
 To build the Windows installer, you will need to install the Freelan build tools Python/SCons scripts.
 
 Building an installer on Windows also requires [Inno Setup](http://www.jrsoftware.org/isinfo.php).
+
+You will also need to compile the `tap-setup.exe` tool from `libasiotap/windows/tap_adapter/tap-setup` using the WDK 7.1. You will find detailed instructions inside this directory.
diff --git a/packaging/windows/SConstruct b/packaging/windows/SConstruct
@@ -8,6 +8,9 @@ minor = '1'
 # You should not need to modify anything below this line
 
 import os
+import sys
+
+sys.path.insert(0, os.path.abspath('../../freelan-buildtools'))
 
 from freelan.buildtools import Environment
 
@@ -16,8 +19,8 @@ env = Environment(ENV = os.environ.copy(), ARGUMENTS = ARGUMENTS)
 defines = {
     'NAME': name,
     'VERSION': major + '.' + minor,
-    'ARCH': env.arch,
-    'XARCH': 'x64' if env.arch == 'amd64' else 'x86',
+    'ARCH': env.arch.lower(),
+    'XARCH': 'x64' if env.arch.lower() == 'amd64' else 'x86',
 }
 
 installer = env.INNOSetup(source = 'freelan.iss', ISCC_DEFINES = defines)
diff --git a/packaging/windows/freelan.iss b/packaging/windows/freelan.iss
@@ -33,7 +33,7 @@ Name: spanish; MessagesFile: compiler:Languages\Spanish.isl
 Name: german; MessagesFile: compiler:Languages\German.isl
 
 [Files]
-Source: ..\..\install\mingw\{#XARCH}\bin\freelan.exe; DestDir: {app}\bin; Flags: ignoreversion; Components: binaries
+Source: ..\..\install\{#XARCH}\Release\bin\freelan.exe; DestDir: {app}\bin; Flags: ignoreversion; Components: binaries
 Source: ..\..\freelan\config\freelan.cfg; DestDir: {app}\config; Flags: ignoreversion onlyifdoesntexist; Components: configuration
 Source: files\{#ARCH}\{#TAPINF}.inf; DestDir: {app}\driver; Flags: ignoreversion; Components: tap_adapter
 Source: files\{#ARCH}\{#TAP}.cat; DestDir: {app}\driver; Flags: ignoreversion; Components: tap_adapter
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@ Installers
		To build the Windows installer, you will need to install the Freelan build tools Python/SCons scripts.

		Building an installer on Windows also requires [Inno Setup](http://www.jrsoftware.org/isinfo.php).

		You will also need to compile the `tap-setup.exe` tool from `libasiotap/windows/tap_adapter/tap-setup` using the WDK 7.1. You will find detailed instructions inside this directory.