Mercurial > trustbridge
changeset 500:4f972b1f4996
Fix packaging information generation
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 25 Apr 2014 10:29:59 +0000 |
| parents | 077b4342d69b |
| children | f925ddfe6301 |
| files | CMakeLists.txt packaging/tmp-createpackage.sh.in packaging/trustbridge.nsi |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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-@PROJECT_VERSION@.exe" \ + -Dsetupname="@CMAKE_BINARY_DIR@/TrustBridge-@PROJECT_VERSION@.exe" \ -Dproductname="TrustBridge" \ - -Dproductname_short="TrustBridge" $MYPATH/trustbridge.nsi + -Dproductname_short="TrustBridge" @CMAKE_SOURCE_DIR@/packaging/trustbridge.nsi rm -r $TMPDIR
--- 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}"