Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Molkentin <danimo@owncloud.com>2012-10-12 16:41:21 +0400
committerDaniel Molkentin <danimo@owncloud.com>2012-10-12 16:44:21 +0400
commitaad21c8c4af8e4f421f5c726f990bb8cd812fe6f (patch)
treeed1b66f9dc7512f85496ec14ec6fc002a821c6e6
parentb7433ccad68d426900f959d2bde54628f2d02228 (diff)
Add license to Windows installer
-rw-r--r--OWNCLOUD.cmake1
-rw-r--r--cmake/modules/NSIS.template.in7
2 files changed, 5 insertions, 3 deletions
diff --git a/OWNCLOUD.cmake b/OWNCLOUD.cmake
index 7a726db51..c27a51acd 100644
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -5,4 +5,5 @@ set( APPLICATION_DOMAIN "owncloud.org" )
set( APPLICATION_VENDOR "ownCloud.org" )
set( THEME_CLASS "ownCloudTheme" )
SET( APPLICATION_REV_DOMAIN "org.owncloud.desktopclient" )
+SET( APPLICATION_LICENSE "COPYING" )
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 826840160..73a22f803 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -5,6 +5,7 @@
!define APPLICATION_VENDOR "@APPLICATION_VENDOR@"
!define APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@.exe"
!define APPLICATION_DOMAIN "@APPLICATION_DOMAIN@"
+!define APPLICATION_LICENSE "@APPLICATION_LICENSE@"
!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
@@ -12,7 +13,7 @@
;-----------------------------------------------------------------------------
; Some installer script options (comment-out options not required)
;-----------------------------------------------------------------------------
-;!define OPTION_LICENSE_AGREEMENT
+!define OPTION_LICENSE_AGREEMENT
!define OPTION_UAC_PLUGIN_ENHANCED
!define OPTION_SECTION_SC_START_MENU
!define OPTION_SECTION_SC_DESKTOP
@@ -40,7 +41,7 @@
!define CSYNC_PLUGIN_DIR "@CSYNC_PLUGIN_DIR@"
!define CSYNC_CONFIG_DIR "@CSYNC_CONFIG_DIR@"
-!define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"
+!define NSI_PATH "${source_path}/admin/win/nsi"
;-----------------------------------------------------------------------------
; Installer version
@@ -125,7 +126,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
;-----------------------------------------------------------------------------
!insertmacro MUI_PAGE_WELCOME
!ifdef OPTION_LICENSE_AGREEMENT
- !insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
+ !insertmacro MUI_PAGE_LICENSE "${source_path}/${APPLICATION_LICENSE}"
!endif
Page custom PageReinstall PageLeaveReinstall
!insertmacro MUI_PAGE_COMPONENTS