Author: richard
Date: Mon Mar 2 02:40:03 2009
New Revision: 4543
URL: http://svn.slimdevices.com/jive?rev=4543&view=rev
Log:
r4...@harrypotter (orig r4526): michael | 2009-02-27 14:41:59 +0000
Bug: n/a
Description: split SqueezePlay installer up into a common source file and the
SP installer itself. The common part will be used by the SC installer to
include SP with SC
r4...@harrypotter (orig r4527): michael | 2009-02-27 15:43:08 +0000
Bug: n/a
Description: install SP to Program Files\SqueezeCenter
Added:
7.4/branches/pango/squeezeplay/src/installer/win32/SqueezePlay-common.iss
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/installer/ (props changed)
7.4/branches/pango/squeezeplay/src/installer/win32/ (props changed)
7.4/branches/pango/squeezeplay/src/installer/win32/SqueezePlay.iss
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Mar 2 02:40:03 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4138
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4510
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4527
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Propchange: 7.4/branches/pango/squeezeplay/src/installer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 2 02:40:03 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+.project
Propchange: 7.4/branches/pango/squeezeplay/src/installer/win32/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 2 02:40:03 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Output
Added: 7.4/branches/pango/squeezeplay/src/installer/win32/SqueezePlay-common.iss
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/installer/win32/SqueezePlay-common.iss?rev=4543&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/installer/win32/SqueezePlay-common.iss
(added)
+++ 7.4/branches/pango/squeezeplay/src/installer/win32/SqueezePlay-common.iss
Mon Mar 2 02:40:03 2009
@@ -1,0 +1,18 @@
+#define SpAppName "SqueezePlay"
+#define SpAppVerName "SqueezePlay 7.4"
+#define SpAppPublisher "Logitech"
+#define SpAppURL "http://www.slimdevices.com";
+#define SpAppExeName "squeezeplay.exe"
+
+[Files]
+Source: {#SpAppSourcePath}..\..\Release\squeezeplay.exe; DestDir: {app};
Flags: ignoreversion; Tasks: ; Languages:
+Source: {#SpAppSourcePath}..\..\Release\*; DestDir: {app}; Flags:
ignoreversion recursesubdirs createallsubdirs; Excludes:
*.pdb,*.ilk,*.exp,*.lib,stdout.txt,stderror.txt
+Source: {#SpAppSourcePath}Microsoft.VC90.CRT\*; DestDir:
{app}\Microsoft.VC90.CRT; Flags: ignoreversion
+Source: {#SpAppSourcePath}Microsoft.VC90.CRT\*; DestDir:
{app}\socket\Microsoft.VC90.CRT; Flags: ignoreversion
+Source: {#SpAppSourcePath}Microsoft.VC90.CRT\*; DestDir:
{app}\mime\Microsoft.VC90.CRT; Flags: ignoreversion
+
+[Icons]
+Name: {group}\{#SpAppName}; Filename: {app}\{#SpAppExeName}
+
+[InstallDelete]
+Name: {app}\lua\*; Type: filesandordirs; Languages:
Modified: 7.4/branches/pango/squeezeplay/src/installer/win32/SqueezePlay.iss
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/installer/win32/SqueezePlay.iss?rev=4543&r1=4542&r2=4543&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/installer/win32/SqueezePlay.iss
(original)
+++ 7.4/branches/pango/squeezeplay/src/installer/win32/SqueezePlay.iss Mon Mar
2 02:40:03 2009
@@ -1,27 +1,22 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "SqueezePlay"
-#define MyAppVerName "SqueezePlay 7.3"
-#define MyAppPublisher "Logitech"
-#define MyAppURL "http://www.slimdevices.com";
-#define MyAppExeName "squeezeplay.exe"
+#define SpAppSourcePath ".\"
+#include "SqueezePlay-common.iss"
[Setup]
; NOTE: The value of AppId uniquely identifies this application.
; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{09B790E3-21E3-4D1A-8130-AAA9227C9785}
-AppName={#MyAppName}
-AppVerName={#MyAppVerName}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DefaultGroupName={#MyAppName}
-OutputBaseFilename={#MyAppName}-setup
-Compression=lzma
+AppName={#SpAppName}
+AppVerName={#SpAppVerName}
+AppPublisher={#SpAppPublisher}
+AppPublisherURL={#SpAppURL}
+AppSupportURL={#SpAppURL}
+AppUpdatesURL={#SpAppURL}
+DefaultDirName={pf}\SqueezeCenter\{#SpAppName}
+DefaultGroupName={#SpAppName}
+DisableReadyPage=yes
+DisableProgramGroupPage=yes
+OutputBaseFilename={#SpAppName}-setup
SolidCompression=yes
OutputDir=Output\Squeezeplay
@@ -32,22 +27,11 @@
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription:
{cm:AdditionalIcons}; Flags: unchecked
Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon};
GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
-[Files]
-Source: ..\..\Release\squeezeplay.exe; DestDir: {app}; Flags: ignoreversion;
Tasks: ; Languages:
-Source: ..\..\Release\*; DestDir: {app}; Flags: ignoreversion recursesubdirs
createallsubdirs; Excludes: *.pdb,*.ilk,*.exp,*.lib,stdout.txt,stderror.txt
-Source: .\Microsoft.VC90.CRT\*; DestDir: {app}\Microsoft.VC90.CRT; Flags:
ignoreversion
-Source: .\Microsoft.VC90.CRT\*; DestDir: {app}\socket\Microsoft.VC90.CRT;
Flags: ignoreversion
-Source: .\Microsoft.VC90.CRT\*; DestDir: {app}\mime\Microsoft.VC90.CRT; Flags:
ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
[Icons]
-Name: {group}\{#MyAppName}; Filename: {app}\{#MyAppExeName}
-Name: {commondesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks:
desktopicon
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName};
Filename: {app}\{#MyAppExeName}; Tasks: quicklaunchicon
-Name: {group}\{cm:UninstallProgram, {#MyAppName}}; Filename: {uninstallexe}
-
+Name: {commondesktop}\{#SpAppName}; Filename: {app}\{#SpAppExeName}; Tasks:
desktopicon
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SpAppName};
Filename: {app}\{#SpAppExeName}; Tasks: quicklaunchicon
+Name: {group}\{cm:UninstallProgram, {#SpAppName}}; Filename: {uninstallexe}
[Run]
-Filename: {app}\{#MyAppExeName}; Description: {cm:LaunchProgram,{#MyAppName}};
Flags: nowait postinstall skipifsilent
-[InstallDelete]
-Name: {app}\lua\*; Type: filesandordirs; Languages:
+Filename: {app}\{#SpAppExeName}; Description: {cm:LaunchProgram,{#SpAppName}};
Flags: nowait postinstall skipifsilent
+
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
