[X2Go-Commits] x2goclient.git - build-main (branch) updated: 4.0.1.1-10-g8cade0e
X2Go dev team
git-admin at x2go.org
Tue Dec 17 15:43:30 CET 2013
The branch, build-main has been updated
via 8cade0ed5bc2e7595d394857f56308c55138f862 (commit)
from a0e76cf105a0a44705b53c9ddf5bf0b4483f15b5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +
COPYING => nsis/gpl.txt | 6 +-
nsis/icons/win-install.ico | Bin 0 -> 1078 bytes
nsis/icons/win-uninstall.ico | Bin 0 -> 1078 bytes
nsis/make_installer.sh | 4 +
nsis/x2goclient.nsi | 167 ++++++++++++++++++++++++++++++++++++++++++
6 files changed, 176 insertions(+), 3 deletions(-)
copy COPYING => nsis/gpl.txt (98%)
mode change 100644 => 100755
create mode 100755 nsis/icons/win-install.ico
create mode 100755 nsis/icons/win-uninstall.ico
create mode 100755 nsis/make_installer.sh
create mode 100755 nsis/x2goclient.nsi
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5e3c3c9..05b5189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low
[ Mike Gabriel ]
* New upstream version (4.0.1.2):
+ Provide Keywords: key in .desktop file.
+ + Add NSIS packaging files for win32 builds to source tree.
+ (Files provided by Oleksandr Shneyder, thanks!!!).
* Pull-in packaging changes from Debian.
[ Ricardo DÃaz MartÃn ]
diff --git a/COPYING b/nsis/gpl.txt
old mode 100644
new mode 100755
similarity index 98%
copy from COPYING
copy to nsis/gpl.txt
index 57f4943..7a8e8ab
--- a/COPYING
+++ b/nsis/gpl.txt
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +336,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff --git a/nsis/icons/win-install.ico b/nsis/icons/win-install.ico
new file mode 100755
index 0000000..c0a5a00
Binary files /dev/null and b/nsis/icons/win-install.ico differ
diff --git a/nsis/icons/win-uninstall.ico b/nsis/icons/win-uninstall.ico
new file mode 100755
index 0000000..9329176
Binary files /dev/null and b/nsis/icons/win-uninstall.ico differ
diff --git a/nsis/make_installer.sh b/nsis/make_installer.sh
new file mode 100755
index 0000000..3e0ee88
--- /dev/null
+++ b/nsis/make_installer.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+upx x2goclient/x2goclient.exe
+makensis x2goclient.nsi
diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi
new file mode 100755
index 0000000..e429895
--- /dev/null
+++ b/nsis/x2goclient.nsi
@@ -0,0 +1,167 @@
+;NSIS Modern User Interface
+;Multilingual Example Script
+;Written by Joost Verburg
+
+
+!include "MUI.nsh"
+!include "FileFunc.nsh"
+!insertmacro Locate
+;--------------------------------
+;General
+
+ RequestExecutionLevel admin
+ !define VERSION "4.0.1.0-pre02"
+ Name "x2goclient-${VERSION}"
+ Caption "x2goclient-${VERSION}"
+ OutFile "x2goclient-${VERSION}-setup.exe"
+ !define MUI_ICON icons\win-install.ico
+ !define MUI_UNICON icons\win-uninstall.ico
+ ;Default installation folder
+ InstallDir "$PROGRAMFILES\x2goclient"
+
+ ;Get installation folder from registry if available
+ InstallDirRegKey HKLM "Software\x2goclient" ""
+
+;--------------------------------
+;Check if user is admin
+Section
+ userInfo::getAccountType
+ pop $0
+ strCmp $0 "Admin" +3
+ messageBox MB_OK $(ADM_RIGHT)
+ abort
+SectionEnd
+
+;--------------------------------
+;Interface Settings
+
+ !define MUI_ABORTWARNING
+
+;--------------------------------
+;Language Selection Dialog Settings
+
+ ;Remember the installer language
+ !define MUI_LANGDLL_REGISTRY_ROOT "HKLM"
+ !define MUI_LANGDLL_REGISTRY_KEY "Software\x2goclient"
+ !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
+;------------------------------
+;Variables
+
+ Var STARTMENU_FOLDER
+ Var MUI_TEMP
+
+;--------------------------------
+;Pages
+
+ !insertmacro MUI_PAGE_LICENSE "gpl.txt"
+ !insertmacro MUI_PAGE_DIRECTORY
+ !define MUI_STARTMENUPAGE_DEFAULTFOLDER "X2Go Client for Windows"
+ !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
+ !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\x2goclient"
+ !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+ !insertmacro MUI_PAGE_STARTMENU "Application" $STARTMENU_FOLDER
+ !insertmacro MUI_PAGE_INSTFILES
+ !insertmacro MUI_UNPAGE_CONFIRM
+ !insertmacro MUI_UNPAGE_INSTFILES
+ !insertmacro MUI_PAGE_FINISH
+
+;--------------------------------
+;Languages
+
+ !insertmacro MUI_LANGUAGE "English"
+ !insertmacro MUI_LANGUAGE "German"
+ !insertmacro MUI_LANGUAGE "Russian"
+
+;--------------------------------
+;Reserve Files
+
+ ;If you are using solid compression, files that are required before
+ ;the actual installation should be stored first in the data block,
+ ;because this will make your installer start faster.
+
+ !insertmacro MUI_RESERVEFILE_LANGDLL
+
+
+;--------------------------------
+;Installer Sections
+Section "x2goclient" Section1
+
+ SetShellVarContext all
+ SectionIn RO
+
+ SetOutPath "$INSTDIR"
+ File /a "x2goclient\*.*"
+ File /r "x2goclient\pulse"
+ File /r "x2goclient\VcXsrv"
+
+ ;Store installation folder
+ WriteRegStr HKLM "Software\x2goclient" "" $INSTDIR
+
+ ;Create uninstaller
+ WriteUninstaller "$INSTDIR\Uninstall.exe"
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+ CreateShortCut "$INSTDIR\X2goClient.lnk" "$INSTDIR\x2goclient.exe"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\X2goClient.lnk" "$INSTDIR\x2goclient.exe"
+ CreateShortCut "$DESKTOP\X2goClient.lnk" "$INSTDIR\x2goclient.exe"
+ CreateShortCut "$DESKTOP\X2goClient.lnk" "$INSTDIR\x2goclient.exe"
+
+ !insertmacro MUI_STARTMENU_WRITE_END
+SectionEnd
+
+;-------------------------------------------
+;Descriptions
+
+
+LangString ADM_RIGHT ${LANG_ENGLISH} "You have to be Administrator on this computer to install X2Go Client"
+LangString ADM_RIGHT ${LANG_GERMAN} "Sie brauchen Administratorenrechte um X2go Client zu installieren"
+LangString ADM_RIGHT ${LANG_RUSSIAN} "Äëÿ òîãî, ÷òîáû óñòàíîâèòü X2Go Client, íåîáõîäèìî áûòü àäìèíèñòðàòîðîì ýòîãî êîìïüþòåðà"
+
+
+!Insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+!Insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;--------------------------------
+;Installer Functions
+
+Function .onInit
+
+ !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+
+ SetShellVarContext all
+
+ !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+ Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+ Delete "$SMPROGRAMS\$MUI_TEMP\X2goClient.lnk"
+ Delete "$DESKTOP\X2goClient.lnk"
+ StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
+ startMenuDeleteLoop:
+ ClearErrors
+ RMDir $MUI_TEMP
+ GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
+ IfErrors startMenuDeleteLoopDone
+ StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
+ startMenuDeleteLoopDone:
+
+ RMDir /r "$INSTDIR"
+
+ DeleteRegKey HKLM "Software\x2goclient"
+
+SectionEnd
+
+;--------------------------------
+;Uninstaller Functions
+
+Function un.onInit
+
+ !insertmacro MUI_UNGETLANGUAGE
+
+FunctionEnd
hooks/post-receive
--
x2goclient.git (X2Go Client)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).
More information about the x2go-commits
mailing list