Author: [EMAIL PROTECTED]
Date: Tue Nov  4 15:14:48 2008
New Revision: 2811

Added:
   branches/release-0.9.12/installer/RegistrySpec.xml
Modified:
   branches/release-0.9.12/build.xml

Log:
Backport of the Windows file association bug fix from r2776 into the 0.9.12 branch.

Modified: branches/release-0.9.12/build.xml
==============================================================================
--- branches/release-0.9.12/build.xml   (original)
+++ branches/release-0.9.12/build.xml   Tue Nov  4 15:14:48 2008
@@ -785,7 +785,15 @@
                                                <res id="Installer.image" 
src="../src/icons/architect.png"/>
                                                <res src="ArchitectShortcut.xml" 
id="shortcutSpec.xml"/>
                                                <res id="LicencePanel.licence" 
src="../LICENSE" />
+                                               <res src="RegistrySpec.xml" 
id="RegistrySpec.xml"/>
                                        </resources>
+                                       <listeners>
+                                               <listener 
installer="SummaryLoggerInstallerListener"/>
+                                       <listener 
installer="RegistryInstallerListener"
+                                                                 
uninstaller="RegistryUninstallerListener">
+                                         <os family="windows"/>
+                                      </listener>
+                                       </listeners>
                                        <panels>
                                                <panel classname="HelloPanel"/>
                                                <panel 
classname="LicencePanel"/>
@@ -818,13 +826,6 @@
                                                        <fileset dir="../src/icons" 
targetdir="$INSTALL_PATH">
                                                                <include 
name="*.ico"/>
                                                        </fileset>
- <parsable targetfile="${INSTALL_PATH}/architect_file_association.reg"/> - <executable targetfile="regedit.exe" stage="postinstall" keep="true">
-                                                          <args>
-                                                            <arg value="\/s"/>
-                                                            <arg 
value="$INSTALL_PATH/architect_file_association.reg"/>
-                                                     </args>
-                                                  </executable>
                                                        <executable targetfile="regedit.exe" 
stage="uninstall" keep="true">
                                                           <args>
                                                             <arg value="\/s"/>
@@ -834,6 +835,9 @@
                                                </pack>
                                        </packs>
                                        <native type="izpack" 
name="ShellLink.dll"/>
+                                       <native type="3rdparty" name="COIOSHelper.dll" 
stage="both">
+                                       <os family="windows"/>
+                                   </native>
                                </installation>
                                ]]>
                        </config>

Added: branches/release-0.9.12/installer/RegistrySpec.xml
==============================================================================
--- (empty file)
+++ branches/release-0.9.12/installer/RegistrySpec.xml Tue Nov 4 15:14:48 2008
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<registry>
+    <pack name="Core">
+       <key root="HKCR"
+                       keypath=".architect"/>
+               <value       root="HKCR"
+                       name=""
+                               keypath=".architect"
+                       string="architect_auto_file"/>
+                       
+               <key         keypath="architect_auto_file"
+                       root="HKCR"/>
+        <value      name=""
+                               keypath="architect_auto_file"
+                               root="HKCR"
+                       string=""/>
+               <value       name="EditFlags"
+                               keypath="architect_auto_file"
+                               root="HKCR"
+                       string="dword:00000000"/>
+               <value       name="BrowserFlags"
+                               keypath="architect_auto_file"
+                               root="HKCR"
+                       string="dword:00000008"/>
+               
+               <key keypath="architect_auto_file\DefaultIcon"
+                               root="HKCR"/>
+               <value       name=""
+                               keypath="architect_auto_file\DefaultIcon"
+                               root="HKCR"
+                       string="$INSTALL_PATH\architect_icon_bundle.ico,0"/>
+
+       <key         keypath="architect_auto_file\shell\open\command"
+                       root="HKCR"/>
+        <value      name=""
+                               keypath="architect_auto_file\shell\open\command"
+                               root="HKCR"
+ string="javaw -Xmx600M -jar &quot;$INSTALL_PATH\architect.jar&quot; &quot;%1&quot; %*"/>
+    </pack>
+</registry>
+

Reply via email to