aboutsummaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
Diffstat (limited to 'release')
-rw-r--r--release/CMakeLists.txt37
-rw-r--r--release/Info.plist.in12
-rw-r--r--release/makemacapp.in10
-rw-r--r--release/maketarball.in14
-rw-r--r--release/tigervnc.iss.in6
-rw-r--r--release/winvnc.iss.in2
6 files changed, 33 insertions, 48 deletions
diff --git a/release/CMakeLists.txt b/release/CMakeLists.txt
index 6cb14de0..8ad6ac3d 100644
--- a/release/CMakeLists.txt
+++ b/release/CMakeLists.txt
@@ -15,18 +15,18 @@ endif()
configure_file(tigervnc.iss.in tigervnc.iss)
-add_custom_target(installer
- iscc -o. ${INST_DEFS} -F${CMAKE_PROJECT_NAME}${INST_SUFFIX}-${VERSION} tigervnc.iss
- DEPENDS vncviewer
- SOURCES ${CMAKE_CURRENT_BINARY_DIR}/tigervnc.iss)
+add_custom_command(OUTPUT ${CMAKE_PROJECT_NAME}${INST_SUFFIX}-${VERSION}.exe
+ COMMAND iscc -o. ${INST_DEFS} -F${CMAKE_PROJECT_NAME}${INST_SUFFIX}-${VERSION} tigervnc.iss
+ DEPENDS vncviewer tigervnc.iss)
+add_custom_target(installer DEPENDS ${CMAKE_PROJECT_NAME}${INST_SUFFIX}-${VERSION}.exe)
if(BUILD_WINVNC)
configure_file(winvnc.iss.in winvnc.iss)
- add_custom_target(winvnc_installer
- iscc -o. ${INST_DEFS} -F${CMAKE_PROJECT_NAME}${INST_SUFFIX}-winvnc-${VERSION} winvnc.iss
- DEPENDS winvnc4 wm_hooks vncconfig
- SOURCES ${CMAKE_CURRENT_BINARY_DIR}/winvnc.iss)
+ add_custom_command(OUTPUT ${CMAKE_PROJECT_NAME}${INST_SUFFIX}-winvnc-${VERSION}.exe
+ COMMAND iscc -o. ${INST_DEFS} -F${CMAKE_PROJECT_NAME}${INST_SUFFIX}-winvnc-${VERSION} winvnc.iss
+ DEPENDS winvnc4 wm_hooks vncconfig winvnc.iss)
+ add_custom_target(winvnc_installer DEPENDS ${CMAKE_PROJECT_NAME}${INST_SUFFIX}-winvnc-${VERSION}.exe)
endif()
endif() # WIN32
@@ -41,9 +41,10 @@ if(APPLE)
configure_file(makemacapp.in makemacapp)
configure_file(Info.plist.in Info.plist)
-add_custom_target(dmg sh makemacapp
- DEPENDS vncviewer
- SOURCES makemacapp)
+add_custom_command(OUTPUT TigerVNC-${VERSION}.dmg
+ COMMAND sh makemacapp
+ DEPENDS vncviewer makemacapp Info.plist)
+add_custom_target(dmg DEPENDS TigerVNC-${VERSION}.dmg)
endif() # APPLE
@@ -56,16 +57,16 @@ if(UNIX)
configure_file(maketarball.in maketarball)
-set(TARBALL_DEPENDS vncviewer vncpasswd vncconfig)
+set(PACKAGE_FILE ${CMAKE_PROJECT_NAME}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-${VERSION}.tar.gz)
+add_custom_command(OUTPUT ${PACKAGE_FILE}
+ COMMAND bash maketarball
+ DEPENDS maketarball vncviewer vncpasswd vncconfig)
+
if(BUILD_JAVA)
- set(TARBALL_DEPENDS ${TARBALL_DEPENDS} java)
+ add_dependencies(${PACKAGE_FILE} java)
endif()
-add_custom_target(tarball bash maketarball
- DEPENDS ${TARBALL_DEPENDS})
-
-add_custom_target(servertarball bash maketarball server
- DEPENDS ${TARBALL_DEPENDS})
+add_custom_target(tarball DEPENDS ${PACKAGE_FILE})
endif() #UNIX
diff --git a/release/Info.plist.in b/release/Info.plist.in
index 3f166bd0..9be17e5e 100644
--- a/release/Info.plist.in
+++ b/release/Info.plist.in
@@ -5,13 +5,13 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDisplayName</key>
- <string>TigerVNC viewer</string>
+ <string>TigerVNC</string>
<key>CFBundleExecutable</key>
- <string>TigerVNC viewer</string>
+ <string>vncviewer</string>
<key>NSHighResolutionCapable</key>
<false/>
<key>CFBundleGetInfoString</key>
- <string>@VERSION@, Copyright © 1998-2025 [many holders]</string>
+ <string>@VERSION@, Copyright (C) 1999-2025 TigerVNC team and many others (see README.rst)</string>
<key>CFBundleIconFile</key>
<string>tigervnc.icns</string>
<key>CFBundleIdentifier</key>
@@ -19,9 +19,9 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>TigerVNC viewer @VERSION@</string>
+ <string>TigerVNC @VERSION@</string>
<key>CFBundleName</key>
- <string>TigerVNC viewer</string>
+ <string>TigerVNC</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
@@ -31,6 +31,6 @@
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>Copyright © 1998-2025 [many holders]</string>
+ <string>Copyright (C) 1999-2025 TigerVNC team and many others (see README.rst)</string>
</dict>
</plist>
diff --git a/release/makemacapp.in b/release/makemacapp.in
index 0827715c..43441b8b 100644
--- a/release/makemacapp.in
+++ b/release/makemacapp.in
@@ -29,25 +29,23 @@ BUILD=@BUILD@
SRCDIR=@CMAKE_SOURCE_DIR@
BINDIR=@CMAKE_BINARY_DIR@
-cd $BINDIR
-
if [ -f $PACKAGE_NAME.dmg ]; then
rm -f $PACKAGE_NAME.dmg
fi
umask 022
TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
-APPROOT="$TMPDIR/dmg/TigerVNC viewer $VERSION.app"
+APPROOT="$TMPDIR/dmg/TigerVNC.app"
mkdir -p "$APPROOT/Contents/MacOS"
mkdir -p "$APPROOT/Contents/Resources"
-install -m 755 vncviewer/vncviewer "$APPROOT/Contents/MacOS/TigerVNC viewer"
+install -m 755 $BINDIR/vncviewer/vncviewer "$APPROOT/Contents/MacOS/"
install -m 644 $SRCDIR/media/icons/tigervnc.icns "$APPROOT/Contents/Resources/"
-install -m 644 release/Info.plist "$APPROOT/Contents/"
+install -m 644 $BINDIR/release/Info.plist "$APPROOT/Contents/"
for lang in `cat "$SRCDIR/po/LINGUAS"`; do
mkdir -p "$APPROOT/Contents/Resources/locale/$lang/LC_MESSAGES"
- install -m 644 po/$lang.mo \
+ install -m 644 $BINDIR/po/$lang.mo \
"$APPROOT/Contents/Resources/locale/$lang/LC_MESSAGES/tigervnc.mo"
done
diff --git a/release/maketarball.in b/release/maketarball.in
index 56618934..108de92c 100644
--- a/release/maketarball.in
+++ b/release/maketarball.in
@@ -28,13 +28,6 @@ if [[ $CFLAGS = *-m32* ]]; then
CPU=i686
fi
PACKAGE_FILE=$PACKAGE_NAME-$OS-$CPU-$VERSION.tar.gz
-SERVER=0
-
-if [ $# -gt 0 ]; then
- if [ "$1" = "server" ]; then
- SERVER=1
- fi
-fi
cd $BINDIR
@@ -47,13 +40,6 @@ mkdir -p $OUTDIR/bin
mkdir -p $OUTDIR/man/man1
make DESTDIR=$TMPDIR/inst install
-if [ $SERVER = 1 ]; then
- install -m 755 ./xorg.build/bin/Xvnc $OUTDIR/bin/
- install -m 644 ./xorg.build/man/man1/Xvnc.1 $OUTDIR/man/man1/Xvnc.1
- install -m 644 ./xorg.build/man/man1/Xserver.1 $OUTDIR/man/man1/Xserver.1
- mkdir -p $OUTDIR/lib/dri/
- install -m 755 ./xorg.build/lib/dri/swrast_dri.so $OUTDIR/lib/dri/
-fi
pushd $TMPDIR/inst
tar cfz ../$PACKAGE_FILE .
diff --git a/release/tigervnc.iss.in b/release/tigervnc.iss.in
index de4ee317..519d232f 100644
--- a/release/tigervnc.iss.in
+++ b/release/tigervnc.iss.in
@@ -5,7 +5,7 @@ ArchitecturesInstallIn64BitMode=x64
AppName=TigerVNC
AppVerName=TigerVNC @VERSION@ (@BUILD@)
AppVersion=@VERSION@
-AppPublisher=TigerVNC project
+AppPublisher=TigerVNC team
AppPublisherURL=https://tigervnc.org
DefaultDirName={pf}\TigerVNC
DefaultGroupName=TigerVNC
@@ -25,8 +25,8 @@ Source: "@CMAKE_SOURCE_DIR@\LICENCE.TXT"; DestDir: "{app}"; Flags: ignoreversion
#for {LINGUAS = FileOpen("@CMAKE_SOURCE_DIR@\po\LINGUAS"); !FileEof(LINGUAS); ""} AddLanguage
[Icons]
-Name: "{group}\TigerVNC Viewer"; FileName: "{app}\vncviewer.exe";
-Name: "{group}\Listening TigerVNC Viewer"; FileName: "{app}\vncviewer.exe"; Parameters: "-listen";
+Name: "{group}\TigerVNC"; FileName: "{app}\vncviewer.exe";
+Name: "{group}\Listening TigerVNC"; FileName: "{app}\vncviewer.exe"; Parameters: "-listen";
Name: "{group}\License"; FileName: "write.exe"; Parameters: "LICENCE.TXT"; WorkingDir: "{app}"; Flags: "useapppaths"
Name: "{group}\Read Me"; FileName: "write.exe"; Parameters: "README.rst"; WorkingDir: "{app}"; Flags: "useapppaths"
diff --git a/release/winvnc.iss.in b/release/winvnc.iss.in
index 773aa175..2b002983 100644
--- a/release/winvnc.iss.in
+++ b/release/winvnc.iss.in
@@ -5,7 +5,7 @@ ArchitecturesInstallIn64BitMode=x64
AppName=TigerVNC server
AppVerName=TigerVNC server v@VERSION@ (@BUILD@)
AppVersion=@VERSION@
-AppPublisher=TigerVNC project
+AppPublisher=TigerVNC team
AppPublisherURL=https://tigervnc.org
DefaultDirName={pf}\TigerVNC server
DefaultGroupName=TigerVNC server
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-08 08:55:24 +0000