[PATCH] Fix packaging information generation

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1398421799 0
# Node ID 4f972b1f4996eb1ea5f671f4a225c6149b515bbb
# Parent  077b4342d69b39fa926f9f4b74112a456e2c6f1f
Fix packaging information generation

diff -r 077b4342d69b -r 4f972b1f4996 CMakeLists.txt
--- a/CMakeLists.txt	Fri Apr 25 10:16:46 2014 +0000
+++ b/CMakeLists.txt	Fri Apr 25 10:29:59 2014 +0000
@@ -113,4 +113,8 @@
 add_subdirectory(doc)
 
 # Configure packaging script for testing
+list(GET NSS_LIBRARIES 1 NSS_BASE_DIR)
+get_filename_component(NSS_BASE_DIR ${NSS_BASE_DIR} PATH)
+
+set(NSS_BASE_DIR "${NSS_BASE_DIR}/..")
 configure_file (packaging/tmp-createpackage.sh.in packaging/tmp-createpackage.sh)
diff -r 077b4342d69b -r 4f972b1f4996 packaging/tmp-createpackage.sh.in
--- a/packaging/tmp-createpackage.sh.in	Fri Apr 25 10:16:46 2014 +0000
+++ b/packaging/tmp-createpackage.sh.in	Fri Apr 25 10:29:59 2014 +0000
@@ -10,8 +10,7 @@
 #NSSDIR is hackish as this will be replaced by static compiling 
 # anyway
 
-NSSDIR="@NSS_INCLUDE_DIRS@/../bin/"
-MYPATH=$(dirname `readlink -f $0`)
+NSSDIR="@NSS_BASE_DIR@/bin/"
 
 TMPDIR=$(mktemp -d)
 
@@ -24,7 +23,7 @@
 makensis -Dfiles_dir=$TMPDIR \
     -Dcompany="Bundesamt für Sicherheit in der Informationstechnik" \
     -Dversion_number=@PROJECT_VERSION@ \
-    -Dsetupname="TrustBridge- at PROJECT_VERSION@.exe" \
+    -Dsetupname="@CMAKE_BINARY_DIR@/TrustBridge- at PROJECT_VERSION@.exe" \
     -Dproductname="TrustBridge" \
-    -Dproductname_short="TrustBridge" $MYPATH/trustbridge.nsi
+    -Dproductname_short="TrustBridge" @CMAKE_SOURCE_DIR@/packaging/trustbridge.nsi
 rm -r $TMPDIR
diff -r 077b4342d69b -r 4f972b1f4996 packaging/trustbridge.nsi
--- a/packaging/trustbridge.nsi	Fri Apr 25 10:16:46 2014 +0000
+++ b/packaging/trustbridge.nsi	Fri Apr 25 10:29:59 2014 +0000
@@ -36,7 +36,8 @@
 ;--------------------------------
 ;Version Information (for installer file properties)
 
-VIProductVersion "${version_number}" ;needs integer format: x.x.x.x
+;VIProductVersion "${version_number}" ;needs integer format: x.x.x.x
+VIProductVersion 1.0.0.0
 VIAddVersionKey "ProductName" "${productname_short}"
 VIAddVersionKey "Comments" "${productname_short} ist Freie Software"
 VIAddVersionKey "CompanyName" "${company}"