Mercurial > trustbridge
diff packaging/create-dist-package.sh.in @ 978:d92b1594e974
Merged.
| author | Emanuel Schuetze <emanuel@intevation.de> |
|---|---|
| date | Fri, 29 Aug 2014 13:10:11 +0200 |
| parents | cbd32175c56c |
| children | 1c1964c27b39 |
line wrap: on
line diff
--- a/packaging/create-dist-package.sh.in Fri Aug 29 13:09:40 2014 +0200 +++ b/packaging/create-dist-package.sh.in Fri Aug 29 13:10:11 2014 +0200 @@ -27,10 +27,10 @@ cd @CMAKE_SOURCE_DIR@/build-i386 echo "Building x86 package" make -j`nproc` -/bin/bash packaging/linux-createpackage.sh +/bin/bash packaging/linux-createpackage.sh i386 cd @CMAKE_BINARY_DIR@ echo "Building amd64 package" -/bin/bash packaging/linux-createpackage.sh +/bin/bash packaging/linux-createpackage.sh x86_64 mkdir -p $TMPDIR/linux mkdir -p $TMPDIR/windows mv @CMAKE_BINARY_DIR@/TrustBridge-@PROJECT_VERSION@.sh \ @@ -40,6 +40,8 @@ cp @CMAKE_SOURCE_DIR@/build-windows/ui/trustbridge.exe $TMPDIR/windows cp @CMAKE_SOURCE_DIR@/build-windows/cinst/cinst.exe $TMPDIR/windows cp @CMAKE_SOURCE_DIR@/build-windows/cinst/mozilla.exe $TMPDIR/windows +cp -r @CMAKE_BINARY_DIR@/manuals/help-manual/html $TMPDIR/windows/doc + cp @CMAKE_SOURCE_DIR@/packaging/filelist.nsh $TMPDIR cp @CMAKE_SOURCE_DIR@/packaging/trustbridge.nsi $TMPDIR cp -r @CMAKE_SOURCE_DIR@/packaging/resources $TMPDIR/resources