[giv] Cleaned up NSIS input files to get separate installers for Win32 and Win64.



commit 2d2a735d48e03893aaa5ab0ede36a0c3c34551d5
Author: Dov Grobgeld <dov grobgeld gmail com>
Date:   Sun Jan 27 22:48:19 2013 +0200

    Cleaned up NSIS input files to get separate installers for Win32 and Win64.

 README                        |    8 +++---
 SConstruct                    |   16 ++++++------
 giv.wine.nsi.in => giv.nsi.in |    0
 src/giv.nsi                   |   49 -----------------------------------------
 4 files changed, 12 insertions(+), 61 deletions(-)
---
diff --git a/README b/README
index a201518..7ea4267 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-Release notes for version 0.9.24beta1
-Thursday 2012-06-21 
-
-This is a test version of giv compiled for Windows64
+Release notes for version 0.9.24
+Sat 2012-12-29 
 
+A fix of the display of binary tiff images and release of 64-bit 
+windows version.
diff --git a/SConstruct b/SConstruct
index 7d99d0e..02a59c9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -71,8 +71,8 @@ if ARGUMENTS.get('mingw', 0):
     env.Append(CPPFLAGS= ['-mms-bitfields'])
 
     env['SYSROOT'] = r"\usr\i686-w64-mingw32\sys-root"
-    env.Command("giv.wine.nsi",
-                ["giv.wine.nsi.in",
+    env.Command("giv-w32.nsi",
+                ["giv.nsi.in",
                  "SConstruct",
                  "configure.in"
                 ],
@@ -84,13 +84,13 @@ if ARGUMENTS.get('mingw', 0):
     
     env.Command("InstallGiv" + env['VER'] + ".exe",
                 ["src/giv.exe",
-                 "giv.wine.nsi",
+                 "giv-w32.nsi",
                  "src/plugins/tiff.dll",
                  "src/plugins/fits.dll",
                  "src/plugins/dicom.dll",
                  "src/plugins/npy.dll",
                  ],
-                ["makensis giv.wine.nsi"])
+                ["makensis giv-w32.nsi"])
     env.Append(LINKFLAGS=['-mwindows'])
 
     # TBD - make this installation dependent
@@ -119,8 +119,8 @@ elif ARGUMENTS.get('mingw64', 0):
     env['DLLWRAP_FLAGS'] = "--mno-cygwin --as=${AS} --export-all --driver-name ${CXX} --dll-tool-name ${DLLTOOL} -s"
     env.Append(CPPFLAGS= ['-mms-bitfields'])
 
-    env.Command("giv.wine.nsi",
-                ["giv.wine.nsi.in",
+    env.Command("giv-w64.nsi",
+                ["giv.nsi.in",
                  "SConstruct",
                  "configure.in"
                 ],
@@ -132,12 +132,12 @@ elif ARGUMENTS.get('mingw64', 0):
     
     env.Command("InstallGiv" + env['VER'] + "-w64.exe",
                 ["src/giv.exe",
-                 "giv.wine.nsi",
+                 "giv-w64.nsi",
                  "src/plugins/tiff.dll",
                  "src/plugins/dicom.dll",
                  "src/plugins/npy.dll",
                  ],
-                ["makensis giv.wine.nsi"])
+                ["makensis giv-w64.nsi"])
     env.Append(LINKFLAGS=['-mwindows'])
 
     # TBD - make this installation dependent
diff --git a/giv.wine.nsi.in b/giv.nsi.in
similarity index 100%
rename from giv.wine.nsi.in
rename to giv.nsi.in



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]