Mercurial > trustbridge
changeset 1186:3de099c8129e
Update packaging for moved help files
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Mon, 22 Sep 2014 13:17:29 +0200 |
| parents | 69f7d302cdb9 |
| children | 913867a8bf40 969970a83b6d |
| files | packaging/create-dist-package.sh.in packaging/linux-createpackage.sh.in packaging/win-createpackage.sh.in |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/packaging/create-dist-package.sh.in Mon Sep 22 13:11:30 2014 +0200 +++ b/packaging/create-dist-package.sh.in Mon Sep 22 13:17:29 2014 +0200 @@ -51,7 +51,7 @@ cp @CMAKE_SOURCE_DIR@/build-windows/cinst/trustbridge-nss-installer.exe $TMPDIR/windows cp -r @CMAKE_SOURCE_DIR@/packaging/resources $TMPDIR/resources cp @CMAKE_SOURCE_DIR@/build-windows/packaging/DesktopShellRun.dll $TMPDIR/resources -cp -r @CMAKE_BINARY_DIR@/manuals/help-manual/html $TMPDIR/windows/doc +cp -r @CMAKE_BINARY_DIR@/doc/help/client/html $TMPDIR/windows/doc cp @CMAKE_SOURCE_DIR@/packaging/filelist.nsh $TMPDIR cp @CMAKE_SOURCE_DIR@/packaging/trustbridge.nsi $TMPDIR
--- a/packaging/linux-createpackage.sh.in Mon Sep 22 13:11:30 2014 +0200 +++ b/packaging/linux-createpackage.sh.in Mon Sep 22 13:17:29 2014 +0200 @@ -48,13 +48,13 @@ "$UNINSTALLER") ICON="@CMAKE_SOURCE_DIR@/ui/img/logo-128.png" -HELPFILES=$(find @CMAKE_BINARY_DIR@/manuals/help-manual/html \ +HELPFILES=$(find @CMAKE_BINARY_DIR@/doc/help/client/html \ -maxdepth 1 -type f -printf "%p \n") -HELPFILES_STATIC=$(find @CMAKE_BINARY_DIR@/manuals/help-manual/html/_static \ +HELPFILES_STATIC=$(find @CMAKE_BINARY_DIR@/doc/help/client/html/_static \ -maxdepth 1 -type f -printf "%p \n") -HELPFILES_IMG=$(find @CMAKE_BINARY_DIR@/manuals/help-manual/html/_images \ +HELPFILES_IMG=$(find @CMAKE_BINARY_DIR@/doc/help/client/html/_images \ -maxdepth 1 -type f -printf "%p \n") -HELPFILES_SOURCES=$(find @CMAKE_BINARY_DIR@/manuals/help-manual/html/_sources \ +HELPFILES_SOURCES=$(find @CMAKE_BINARY_DIR@/doc/help/client/html/_sources \ -maxdepth 1 -type f -printf "%p \n") # Make installation in TMPDIR, this is what we will put into the
--- a/packaging/win-createpackage.sh.in Mon Sep 22 13:11:30 2014 +0200 +++ b/packaging/win-createpackage.sh.in Mon Sep 22 13:17:29 2014 +0200 @@ -14,7 +14,7 @@ TMPINST=$(mktemp) EXEFILES=$(find . -name trustbridge-certificate-installer.exe -o -name trustbridge.exe -o -name trustbridge-nss-installer.exe) -HELPDIR=@CMAKE_BINARY_DIR@/manuals/help-manual/html +HELPDIR=@CMAKE_BINARY_DIR@/doc/help/client/html cp $EXEFILES $TMPDIR cp -r $HELPDIR $TMPDIR/doc