From 564126810aaf834bac66c8f7718d99f159185ce6 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Fri, 27 Jul 2018 10:32:56 +0200 Subject: [PATCH] Use new blueprint repo craft-blueprints-quassel --- appveyor.ini => .appveyor.ini | 5 +- appveyor.yml => .appveyor.yml | 14 +- scripts/build/NullsoftInstaller.nsi | 271 ---------------------------- scripts/build/SnoreNotify.nsh | 22 --- 4 files changed, 9 insertions(+), 303 deletions(-) rename appveyor.ini => .appveyor.ini (83%) rename appveyor.yml => .appveyor.yml (73%) delete mode 100644 scripts/build/NullsoftInstaller.nsi delete mode 100644 scripts/build/SnoreNotify.nsh diff --git a/appveyor.ini b/.appveyor.ini similarity index 83% rename from appveyor.ini rename to .appveyor.ini index 8189a038..5452b12c 100644 --- a/appveyor.ini +++ b/.appveyor.ini @@ -4,7 +4,7 @@ Branch = master ShallowClone = True # Variables defined here override the default value -# The variable names are casesensitive +# The variable names are case sensitive [Variables] #Root = D:\qt-sdk @@ -17,10 +17,9 @@ Paths/Python27 = C:\Python27 ShortPath/Enabled = False Compile/BuildType = Release ContinuousIntegration/Enabled = True -Packager/PackageType = MultiCollectionPackager [BlueprintSettings] -qt-apps/quassel.version = master +quassel/quassel.version = master binary/mysql.ignored = True diff --git a/appveyor.yml b/.appveyor.yml similarity index 73% rename from appveyor.yml rename to .appveyor.yml index 30d9dc12..0e6a54f0 100644 --- a/appveyor.yml +++ b/.appveyor.yml @@ -11,25 +11,25 @@ init: install: - ps: | - mkdir C:\CraftMaster | Out-Null #use cmd to silence powershell behaviour for stderr & cmd /C "git clone -q --depth=1 git://anongit.kde.org/craftmaster.git C:\CraftMaster\CraftMaster 2>&1" - & C:\python36\python.exe C:\CraftMaster\CraftMaster\CraftMaster.py --config $env:APPVEYOR_BUILD_FOLDER\appveyor.ini --target $env:TARGET - craft -p quassel + & C:\python36\python.exe C:\CraftMaster\CraftMaster\CraftMaster.py --config $env:APPVEYOR_BUILD_FOLDER\.appveyor.ini --target $env:TARGET + craft --add-blueprint-repository https://github.com/quassel/craft-blueprints-quassel.git + craft -p quassel/quassel craft nsis - craft --install-deps quassel + craft --install-deps quassel/quassel build_script: - ps: | - craft --no-cache --src-dir $env:APPVEYOR_BUILD_FOLDER quassel + craft --no-cache --src-dir $env:APPVEYOR_BUILD_FOLDER quassel/quassel test_script: - ps: | - craft --src-dir $env:APPVEYOR_BUILD_FOLDER --test quassel + craft --src-dir $env:APPVEYOR_BUILD_FOLDER --test quassel/quassel on_success: - ps: | - craft --src-dir $env:APPVEYOR_BUILD_FOLDER --package quassel + craft --src-dir $env:APPVEYOR_BUILD_FOLDER --package quassel/quassel Get-ChildItem C:\CraftMaster\$env:TARGET\tmp\* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } environment: diff --git a/scripts/build/NullsoftInstaller.nsi b/scripts/build/NullsoftInstaller.nsi deleted file mode 100644 index 6a7375d6..00000000 --- a/scripts/build/NullsoftInstaller.nsi +++ /dev/null @@ -1,271 +0,0 @@ -; basic script template for NullsoftInstallerPackager -; -; Copyright 2013 Patrick von Reth -; Copyright 2010 Patrick Spendrin -; adapted from marble.nsi - -var ToBeRunned -var nameOfToBeRunend - -!define productname "Quassel" -!define company "KDE" - -!include MUI2.nsh -!include LogicLib.nsh -!include SnoreNotify.nsh - - -; registry stuff -!define regkey "Software\${company}\${productname}" -!define uninstkey "Software\Microsoft\Windows\CurrentVersion\Uninstall\Quassel" - -!define startmenu "$SMPROGRAMS\${productname}" -!define uninstaller "uninstall.exe" - -Var StartMenuFolder - -!define PRODUCT_WEB_SITE https://quassel-irc.org/ -!define MyApp_AppUserModelId QuasselProject.QuasselIRC -!define SnoreToastExe "$INSTDIR\SnoreToast.exe" - -;Start Menu Folder Page Configuration -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "${regkey}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" - -InstType "Full" -;-------------------------------- - - -XPStyle on -ShowInstDetails hide -ShowUninstDetails hide - -SetCompressor /SOLID lzma - -Name ${productname} -Caption "${caption}" - -OutFile "${setupname}" - -!define MUI_ICON ${gitDir}\pics\quassel.ico - -!insertmacro MUI_PAGE_WELCOME - -;!insertmacro MUI_PAGE_LICENSE -#${license} -;!insertmacro MUI_PAGE_LICENSE - -!insertmacro MUI_PAGE_DIRECTORY - -!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder - -!define MUI_COMPONENTSPAGE_NODESC -!insertmacro MUI_PAGE_COMPONENTS - -!insertmacro MUI_PAGE_INSTFILES - -!define MUI_FINISHPAGE_RUN $ToBeRunned -!define MUI_FINISHPAGE_RUN_TEXT $nameOfToBeRunend -!define MUI_FINISHPAGE_LINK "Visit project homepage" -!define MUI_FINISHPAGE_LINK_LOCATION "${PRODUCT_WEB_SITE}" -!insertmacro MUI_PAGE_FINISH - -;uninstaller -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH -;------- - -!insertmacro MUI_LANGUAGE "English" - -SetDateSave on -SetDatablockOptimize on -CRCCheck on -SilentInstall normal - -InstallDir "${defaultinstdir}\${productname}" -InstallDirRegKey HKLM "${regkey}" "" - - -;-------------------------------- -AutoCloseWindow false - - -; beginning (invisible) section -Section "--hidden Quassel Base" QUASSEL_BASE - SectionIn RO - SetOutPath $INSTDIR - SetShellVarContext all - StrCpy $ToBeRunned "" - - WriteRegStr HKLM "${regkey}" "Install_Dir" "$INSTDIR" - WriteRegStr HKLM "${regkey}" "Version" "${version}" - WriteRegStr HKLM "${regkey}" "" "$INSTDIR\uninstall.exe" - - WriteRegStr HKLM "${uninstkey}" "DisplayName" "Quassel (remove only)" - WriteRegStr HKLM "${uninstkey}" "DisplayIcon" "$INSTDIR\${MUI_ICON}" - WriteRegStr HKLM "${uninstkey}" "DisplayVersion" "${version}" - WriteRegStr HKLM "${uninstkey}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegStr HKLM "${uninstkey}" "UninstallString" '"$INSTDIR\${uninstaller}"' - WriteRegStr HKLM "${uninstkey}" "Publisher" "${company}" - - SetOutPath $INSTDIR - - - ; package all files, recursively, preserving attributes - ; assume files are in the correct places - - File /a /r /x "*.nsi" /x "*quassel.exe" /x "*quasselclient.exe" /x "*quasselcore.exe" /x "${setupname}" "${srcdir}\*.*" - File /a ${MUI_ICON} - - !if "${vcredist}" != "none" - File /a /oname=vcredist.exe "${vcredist}" - ExecWait '"$INSTDIR\vcredist.exe" /passive' - Delete "$INSTDIR\vcredist.exe" - !endif - - WriteUninstaller "${uninstaller}" - - - ;Create shortcuts - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\uninstall.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - - -Section "Quassel" QUASSEL_ALL_IN_ONE - SectionIn 1 - SetOutPath $INSTDIR - StrCpy $ToBeRunned "$INSTDIR\quassel.exe" - StrCpy $nameOfToBeRunend "Run Quassel" - File /a /oname=quassel.exe "${srcdir}\quassel.exe" - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - !insertmacro SnoreShortcut "$SMPROGRAMS\$StartMenuFolder\Quassel.lnk" "$INSTDIR\quassel.exe" "${MyApp_AppUserModelId}" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -Section "QuasselClient" QUASSEL_CLIENT - SectionIn 1 - SetOutPath $INSTDIR - ${If} $ToBeRunned == "" - StrCpy $ToBeRunned "$INSTDIR\quasselclient.exe" - StrCpy $nameOfToBeRunend "Run QuasselClient" - ${Endif} - File /a /oname=quasselclient.exe "${srcdir}\quasselclient.exe" - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - !insertmacro SnoreShortcut "$SMPROGRAMS\$StartMenuFolder\Quassel Client.lnk" "$INSTDIR\quasselclient.exe" "${MyApp_AppUserModelId}" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -Section "QuasselCore" QUASSEL_CORE - SectionIn 1 - SetOutPath $INSTDIR - ${If} $ToBeRunned == "" - StrCpy $ToBeRunned "$INSTDIR\quasselcore.exe" - StrCpy $nameOfToBeRunend "Run QuasselCore" - ${Endif} - File /a /oname=quasselcore.exe "${srcdir}\quasselcore.exe" - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Quassel Core.lnk" "$INSTDIR\quasselcore.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -; Section /o "QuasselCoreService" QUASSEL_CORE_SERVICE - ; SimpleSC::ExistsService "QuasselCore" - ; Pop $0 ; returns an errorcode if the service doesn't exists (<>0)/service exists (0) - ; ${If} $0 == 0 - ; MessageBox MB_OK|MB_ICONSTOP "Install Service QUassel failed - Reason: Service already exists" - ; ${Else} - ; SimpleSC::InstallService "QuasselCore" "QuasselCore" "16" "2" "$INSTDIR\bin\quasselcore.exe" "" "" "" - ; Pop $0 ; returns an errorcode (<>0) otherwise success (0) - ; ${If} $0 != 0 - ; Push $0 - ; SimpleSC::GetErrorMessage - ; Pop $0 - ; MessageBox MB_OK|MB_ICONSTOP "Install of Service QUassel failed - Reason: $0" - ; ${Else} - ; SimpleSC::StartService "QuasselCore" "" 30 - ; Pop $0 ; returns an errorcode (<>0) otherwise success (0) - ; ${If} $0 != 0 - ; Push $0 - ; SimpleSC::GetErrorMessage - ; Pop $0 - ; MessageBox MB_OK|MB_ICONSTOP "Install of Service QUassel failed - Reason: $0" - ; ${EndIf} - ; ${EndIf} - ; ${EndIf} -; SectionEnd - -; Uninstaller -; All section names prefixed by "Un" will be in the uninstaller - -UninstallText "This will uninstall Quassel." - -Section "Uninstall" - SetShellVarContext all - SetShellVarContext all - - DeleteRegKey HKLM "${uninstkey}" - DeleteRegKey HKLM "${regkey}" - - !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder - - - ; SimpleSC::ExistsService "QuasselCore" - ; Pop $0 ; returns an errorcode if the service doesn't exists (<>0)/service exists (0) - ; ${If} $0 == 0 - ; SimpleSC::ServiceIsStopped "QuasselCore" - ; Pop $0 ; returns an errorcode (<>0) otherwise success (0) - ; Pop $1 ; returns 1 (service is stopped) - returns 0 (service is not stopped) - ; ${If} $0 == 0 - ; ${AndIf} $1 == 0 - ; SimpleSC::StopService "QuasselCore" 1 30 - ; Pop $0 ; returns an errorcode (<>0) otherwise success (0) - ; ${If} $0 != 0 - ; Push $0 - ; SimpleSC::GetErrorMessage - ; Pop $0 - ; MessageBox MB_OK|MB_ICONSTOP "Stopping failed - Reason: $0" - ; ${Else} - ; SimpleSC::RemoveService "QuasselCore" - ; Pop $0 ; returns an errorcode (<>0) otherwise success (0) - ; ${If} $0 != 0 - ; Push $0 - ; SimpleSC::GetErrorMessage - ; Pop $0 - ; MessageBox MB_OK|MB_ICONSTOP "Remove fails - Reason: $0" - ; ${EndIf} - ; ${EndIf} - ; ${EndIf} - ; ${EndIf} - - RMDir /r "$SMPROGRAMS\$StartMenuFolder" - RMDir /r "$INSTDIR" -SectionEnd - -Function .onSelChange - ${If} ${SectionIsSelected} ${QUASSEL_CORE} - ${OrIf} ${SectionIsSelected} ${QUASSEL_CLIENT} - ${OrIf} ${SectionIsSelected} ${QUASSEL_ALL_IN_ONE} - GetDlgItem $0 $HWNDPARENT 1 - EnableWindow $0 1 - ${Else} - GetDlgItem $0 $HWNDPARENT 1 - EnableWindow $0 0 - ${EndIf} -FunctionEnd - -Function .onInit - ReadRegStr $R0 HKLM "${uninstkey}" "UninstallString" - StrCmp $R0 "" done - ReadRegStr $INSTDIR HKLM "${regkey}" "Install_Dir" - ;Run the uninstaller - ;uninst: - ClearErrors - ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file - done: -FunctionEnd diff --git a/scripts/build/SnoreNotify.nsh b/scripts/build/SnoreNotify.nsh deleted file mode 100644 index a83aecd2..00000000 --- a/scripts/build/SnoreNotify.nsh +++ /dev/null @@ -1,22 +0,0 @@ -!include LogicLib.nsh -!include WordFunc.nsh - -Function SnoreWinVer - ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion - ${VersionCompare} "6.2" $R0 $R0 - ${If} $R0 == 1 - Push "NotWin8" - ${Else} - Push "AtLeastWin8" - ${EndIf} -FunctionEnd - -!macro SnoreShortcut path exe appID - Call SnoreWinVer - Pop $0 - ${If} $0 == "AtLeastWin8" - nsExec::ExecToLog '"${SnoreToastExe}" -install "${path}" "${exe}" "${appID}"' - ${Else} - CreateShortCut "${path}" "${exe}" - ${EndIf} -!macroend -- 2.20.1