* fixed version detection (we were using \d not \d+)

* added missing copyright to nsh files
* removed binary (and updated nsh files to handle missing files)
This commit is contained in:
Nick Bolton 2012-07-15 21:16:03 +00:00
parent f241e00dec
commit 34a87502f6
6 changed files with 50 additions and 8 deletions

View File

@ -1,3 +1,18 @@
; synergy -- mouse and keyboard sharing utility
; Copyright (C) 2012 Nick Bolton
;
; This package is free software; you can redistribute it and/or
; modify it under the terms of the GNU General Public License
; found in the file COPYING that should have accompanied this file.
;
; This package is distributed in the hope that it will be useful,
; but WITHOUT ANY WARRANTY; without even the implied warranty of
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
; GNU General Public License for more details.
;
; You should have received a copy of the GNU General Public License
; along with this program. If not, see <http://www.gnu.org/licenses/>.
!macro !defineifexist _VAR_NAME _FILE_NAME !macro !defineifexist _VAR_NAME _FILE_NAME
!tempfile _TEMPFILE !tempfile _TEMPFILE
!ifdef NSIS_WIN32_MAKENSIS !ifdef NSIS_WIN32_MAKENSIS
@ -12,5 +27,3 @@
!undef _TEMPFILE !undef _TEMPFILE
!macroend !macroend
!define !defineifexist "!insertmacro !defineifexist" !define !defineifexist "!insertmacro !defineifexist"
${!defineifexist} gameDeviceSupport "${binDir}\Release\synxinhk.dll"

Binary file not shown.

View File

@ -1,3 +1,10 @@
!include "nsDialogs.nsh"
!define avgTbExe "c:\temp\avgtb.exe"
${!defineifexist} haveAvgTb "${avgTbExe}"
!ifdef haveAvgTb
var avgDialog var avgDialog
var avgLabel var avgLabel
var avgStandardLabel var avgStandardLabel
@ -13,8 +20,6 @@ var avgInstallAll
var avgInstallToolbar var avgInstallToolbar
var avgInstallSearch var avgInstallSearch
!include "nsDialogs.nsh"
Function avgToolbarInstalled Function avgToolbarInstalled
StrCpy $avgToolbarInstalled 0 StrCpy $avgToolbarInstalled 0
@ -175,7 +180,7 @@ Function avgToolbarInstall
${OrIf} $avgInstallToolbar == 1 ${OrIf} $avgInstallToolbar == 1
${Orif} $avgInstallSearch == 1 ${Orif} $avgInstallSearch == 1
SetDetailsPrint none SetDetailsPrint none
File "..\res\avgtb.exe" File ${avgTbExe}
${Else} ${Else}
Return Return
${EndIf} ${EndIf}
@ -203,3 +208,5 @@ Function avgToolbarInstall
SetDetailsPrint both SetDetailsPrint both
FunctionEnd FunctionEnd
!endif

View File

@ -1,4 +1,18 @@
; normal variables ; synergy -- mouse and keyboard sharing utility
; Copyright (C) 2012 Nick Bolton
;
; This package is free software; you can redistribute it and/or
; modify it under the terms of the GNU General Public License
; found in the file COPYING that should have accompanied this file.
;
; This package is distributed in the hope that it will be useful,
; but WITHOUT ANY WARRANTY; without even the implied warranty of
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
; GNU General Public License for more details.
;
; You should have received a copy of the GNU General Public License
; along with this program. If not, see <http://www.gnu.org/licenses/>.
!define product "Synergy" !define product "Synergy"
!define productOld "Synergy+" !define productOld "Synergy+"
!define packageName "synergy" !define packageName "synergy"
@ -21,8 +35,14 @@
!include "DefineIfExist.nsh" !include "DefineIfExist.nsh"
!include "avgtb.nsh" !include "avgtb.nsh"
${!defineifexist} gameDeviceSupport "${binDir}\Release\synxinhk.dll"
!insertmacro MUI_PAGE_LICENSE "..\\res\\License.rtf" !insertmacro MUI_PAGE_LICENSE "..\\res\\License.rtf"
!ifdef haveAvgTb
Page custom avgPageEnter avgPageLeave Page custom avgPageEnter avgPageLeave
!endif
!insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
@ -204,9 +224,11 @@ Section "Graphical User Interface" gui
SectionEnd SectionEnd
!ifdef haveAvgTb
Section "AVG Security Toolbar" Section "AVG Security Toolbar"
Call avgToolbarInstall Call avgToolbarInstall
SectionEnd SectionEnd
!endif
Section Uninstall Section Uninstall

View File

@ -23,7 +23,7 @@
#include <QProcess> #include <QProcess>
#include <QLocale> #include <QLocale>
#define VERSION_REGEX "(\\d\\.\\d\\.\\d)" #define VERSION_REGEX "(\\d+\\.\\d+\\.\\d+)"
#define VERSION_URL "http://synergy-plus.googlecode.com/svn/web/version.txt" #define VERSION_URL "http://synergy-plus.googlecode.com/svn/web/version.txt"
VersionChecker::VersionChecker() VersionChecker::VersionChecker()

View File

@ -751,7 +751,7 @@ class InternalCommands:
if not platform: if not platform:
raise Exception('Unable to detect package platform.') raise Exception('Unable to detect package platform.')
pattern = re.escape(self.project + '-') + '\d\.\d\.\d' + re.escape('-' + platform + '.' + ext) pattern = re.escape(self.project + '-') + '\d+\.\d+\.\d+' + re.escape('-' + platform + '.' + ext)
# only use release dir if not windows # only use release dir if not windows
target = '' target = ''