git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4284 3789f03b-4d11-0410-bbf8-ca57d06f2519tags/v1.0.90
@@ -120,11 +120,11 @@ add_subdirectory(win) | |||
# Installer | |||
# | |||
set(INST_NAME ${CMAKE_PROJECT_NAME}) | |||
if(64BIT) | |||
set(INST_NAME ${INST_NAME}64) | |||
set(INST_NAME ${CMAKE_PROJECT_NAME}64-${VERSION}) | |||
set(INST_DEFS -DWIN64) | |||
else() | |||
set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}) | |||
endif() | |||
if(MSVC_IDE) |
@@ -95,7 +95,7 @@ sudo osacompile -t APPL -o "$TMPDIR/dmg/Uninstall.app" $TMPDIR/uninstall.applesc | |||
sudo chown -R $USER "$TMPDIR/dmg/Uninstall.app" | |||
hdiutil create -fs HFS+ -volname $PACKAGE_NAME-$VERSION \ | |||
-srcfolder "$TMPDIR/dmg" \ | |||
$TMPDIR/$PACKAGE_NAME.dmg | |||
cp $TMPDIR/$PACKAGE_NAME.dmg . | |||
$TMPDIR/$PACKAGE_NAME-$VERSION.dmg | |||
cp $TMPDIR/$PACKAGE_NAME-$VERSION.dmg . | |||
exit |
@@ -19,7 +19,9 @@ PACKAGE_NAME=@PACKAGE_NAME@ | |||
VERSION=@VERSION@ | |||
BUILD=@BUILD@ | |||
SRCDIR=@srcdir@ | |||
PACKAGE_FILE=$PACKAGE_NAME-`uname -s`-@host_cpu@.tar.gz | |||
OS=`uname -s` | |||
CPU=@host_cpu@ | |||
PACKAGE_FILE=$PACKAGE_NAME-$OS-$CPU-$VERSION.tar.gz | |||
SERVER=0 | |||
if [ $# -gt 0 ]; then |