Update windows installer project

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@351 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

1 files changed, 19 insertions, 19 deletions

diff --git a/installer/windows/PDF-Over-signed.aip b/installer/windows/PDF-Over-signed.aip
index 05bc29d6..b741a8dd 100644
--- a/installer/windows/PDF-Over-signed.aip
+++ b/installer/windows/PDF-Over-signed.aip
@@ -34,21 +34,21 @@
   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">

     <ROW Component="AIShRegAnswer" ComponentId="{19C5B0EB-63C2-4BE4-B2C8-B5EFC6393279}" Directory_="APPDIR" Attributes="4" KeyPath="AIShRegAnswer"/>

-    <ROW Component="PDFOver.exe" ComponentId="{E9F191CE-3528-4FB1-994F-D18A8AEB8ADF}" Directory_="APPDIR" Attributes="0" KeyPath="PDFOver.exe"/>

-    <ROW Component="PDFOver.ini" ComponentId="{CFB5CC37-CDB0-48F7-8061-1125BF88348E}" Directory_="APPDIR" Attributes="0" KeyPath="PDFOver.ini" Type="0"/>

+    <ROW Component="PDFOver.exe" ComponentId="{60642A97-7B5B-41D6-94CB-42074F600850}" Directory_="APPDIR" Attributes="0" KeyPath="PDFOver.exe"/>

+    <ROW Component="PDFOver.ini" ComponentId="{21452EE3-1B6C-4C9F-9B71-80F73B675B18}" Directory_="APPDIR" Attributes="0" KeyPath="PDFOver.ini" Type="0"/>

     <ROW Component="ProductInformation" ComponentId="{8126D538-2928-475F-8DBB-9BFB1EB29D9F}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>

-    <ROW Component="SHORTCUTDIR" ComponentId="{3D0C2442-A970-4AC3-9C83-B58704F3EAB2}" Directory_="SHORTCUTDIR" Attributes="0"/>

-    <ROW Component="axis1.0.jar" ComponentId="{08E4A513-763A-45F0-A70A-4EB8E1044531}" Directory_="lib_Dir" Attributes="0" KeyPath="axis1.0.jar" Type="0"/>

-    <ROW Component="icon.ico" ComponentId="{01FE1EF4-296B-4F1B-A8FD-C43A8E263CD3}" Directory_="icons_Dir" Attributes="0" KeyPath="icon.ico" Type="0"/>

-    <ROW Component="swtwindows32.jar" ComponentId="{D98ACD4F-0575-4C54-A8CF-1BF04A3ACDB7}" Directory_="libswt_Dir" Attributes="0" KeyPath="swtwindows32.jar" Type="0"/>

+    <ROW Component="SHORTCUTDIR" ComponentId="{5B334D06-0B46-4A9D-9B3E-BF73A7410589}" Directory_="SHORTCUTDIR" Attributes="0"/>

+    <ROW Component="axis1.0.jar" ComponentId="{899081D6-93F5-4D5F-8CC4-D2598E2ABE49}" Directory_="lib_Dir" Attributes="0" KeyPath="axis1.0.jar" Type="0"/>

+    <ROW Component="icon.ico" ComponentId="{D8E8BCE8-7FC0-4C55-9DAA-5BC40E88CBA4}" Directory_="icons_Dir" Attributes="0" KeyPath="icon.ico" Type="0"/>

+    <ROW Component="swtwindows32.jar" ComponentId="{3DBC73A4-AC6C-4DB9-B66A-20845DFABF72}" Directory_="libswt_Dir" Attributes="0" KeyPath="swtwindows32.jar" Type="0"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">

     <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AIShRegAnswer PDFOver.exe PDFOver.ini ProductInformation SHORTCUTDIR axis1.0.jar icon.ico swtwindows32.jar"/>

     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">

-    <ROW File="PDFOver.exe" Component_="PDFOver.exe" FileName="PDF-Over.exe" Attributes="0" SourcePath="C:\Programme\PDF-Over\PDF-Over.exe" SelfReg="false" NextFile="icon.ico"/>

-    <ROW File="PDFOver.ini" Component_="PDFOver.ini" FileName="PDF-Over.ini" Attributes="0" SourcePath="C:\Programme\PDF-Over\PDF-Over.ini" SelfReg="false" NextFile="PDFOver.exe"/>

+    <ROW File="PDFOver.exe" Component_="PDFOver.exe" FileName="PDF-Over.exe" Attributes="0" SourcePath="C:\Programme\PDF-Over\PDF-Over.exe" SelfReg="false" NextFile="PDFOver.ini"/>

+    <ROW File="PDFOver.ini" Component_="PDFOver.ini" FileName="PDF-Over.ini" Attributes="0" SourcePath="C:\Programme\PDF-Over\PDF-Over.ini" SelfReg="false"/>

     <ROW File="axis1.0.jar" Component_="axis1.0.jar" FileName="axis-1~1.jar|axis-1.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\axis-1.0.jar" SelfReg="false" NextFile="axisjaxrpc1.0.jar"/>

     <ROW File="axisjaxrpc1.0.jar" Component_="axis1.0.jar" FileName="axis-j~1.jar|axis-jaxrpc-1.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\axis-jaxrpc-1.0.jar" SelfReg="false" NextFile="axissaaj1.0.jar"/>

     <ROW File="axissaaj1.0.jar" Component_="axis1.0.jar" FileName="axis-s~1.jar|axis-saaj-1.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\axis-saaj-1.0.jar" SelfReg="false" NextFile="axiswsdl4j1.0.jar"/>

@@ -63,14 +63,14 @@
     <ROW File="fontbox0.8.0incubator.jar" Component_="axis1.0.jar" FileName="fontbo~1.jar|fontbox-0.8.0-incubator.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\fontbox-0.8.0-incubator.jar" SelfReg="false" NextFile="iaik_ecc_eval_signed2.19.jar"/>

     <ROW File="iaik_ecc_eval_signed2.19.jar" Component_="axis1.0.jar" FileName="iaik_e~1.jar|iaik_ecc_eval_signed-2.19.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\iaik_ecc_eval_signed-2.19.jar" SelfReg="false" NextFile="iaik_jce_eval_signed4.0.jar"/>

     <ROW File="iaik_jce_eval_signed4.0.jar" Component_="axis1.0.jar" FileName="iaik_j~1.jar|iaik_jce_eval_signed-4.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\iaik_jce_eval_signed-4.0.jar" SelfReg="false" NextFile="itext2.1.5rev3628pdfas1.1.jar"/>

-    <ROW File="icon.ico" Component_="icon.ico" FileName="icon.ico" Attributes="0" SourcePath="c:\Programme\PDF-Over\icons\icon.ico" SelfReg="false" NextFile="icon.png"/>

-    <ROW File="icon.png" Component_="icon.ico" FileName="icon.png" Attributes="0" SourcePath="c:\Programme\PDF-Over\icons\icon.png" SelfReg="false" NextFile="icon144x144.png"/>

-    <ROW File="icon144x144.png" Component_="icon.ico" FileName="icon14~1.png|icon144x144.png" Attributes="0" SourcePath="c:\Programme\PDF-Over\icons\icon144x144.png" SelfReg="false" NextFile="icon16x16.png"/>

-    <ROW File="icon16x16.png" Component_="icon.ico" FileName="icon16~1.png|icon16x16.png" Attributes="0" SourcePath="c:\Programme\PDF-Over\icons\icon16x16.png" SelfReg="false" NextFile="icon24x24.png"/>

-    <ROW File="icon24x24.png" Component_="icon.ico" FileName="icon24~1.png|icon24x24.png" Attributes="0" SourcePath="c:\Programme\PDF-Over\icons\icon24x24.png" SelfReg="false" NextFile="icon32x32.png"/>

-    <ROW File="icon32x32.png" Component_="icon.ico" FileName="icon32~1.png|icon32x32.png" Attributes="0" SourcePath="c:\Programme\PDF-Over\icons\icon32x32.png" SelfReg="false" NextFile="icon48x48.png"/>

-    <ROW File="icon48x48.png" Component_="icon.ico" FileName="icon48~1.png|icon48x48.png" Attributes="0" SourcePath="c:\Programme\PDF-Over\icons\icon48x48.png" SelfReg="false" NextFile="icon96x96.png"/>

-    <ROW File="icon96x96.png" Component_="icon.ico" FileName="icon96~1.png|icon96x96.png" Attributes="0" SourcePath="c:\Programme\PDF-Over\icons\icon96x96.png" SelfReg="false" NextFile="axis1.0.jar"/>

+    <ROW File="icon.ico" Component_="icon.ico" FileName="icon.ico" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon.ico" SelfReg="false" NextFile="icon.png"/>

+    <ROW File="icon.png" Component_="icon.ico" FileName="icon.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon.png" SelfReg="false" NextFile="icon144x144.png"/>

+    <ROW File="icon144x144.png" Component_="icon.ico" FileName="icon14~1.png|icon144x144.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon144x144.png" SelfReg="false" NextFile="icon16x16.png"/>

+    <ROW File="icon16x16.png" Component_="icon.ico" FileName="icon16~1.png|icon16x16.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon16x16.png" SelfReg="false" NextFile="icon24x24.png"/>

+    <ROW File="icon24x24.png" Component_="icon.ico" FileName="icon24~1.png|icon24x24.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon24x24.png" SelfReg="false" NextFile="icon32x32.png"/>

+    <ROW File="icon32x32.png" Component_="icon.ico" FileName="icon32~1.png|icon32x32.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon32x32.png" SelfReg="false" NextFile="icon48x48.png"/>

+    <ROW File="icon48x48.png" Component_="icon.ico" FileName="icon48~1.png|icon48x48.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon48x48.png" SelfReg="false" NextFile="icon96x96.png"/>

+    <ROW File="icon96x96.png" Component_="icon.ico" FileName="icon96~1.png|icon96x96.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon96x96.png" SelfReg="false" NextFile="PDFOver.exe"/>

     <ROW File="itext2.1.5rev3628pdfas1.1.jar" Component_="axis1.0.jar" FileName="itext-~1.jar|itext-2.1.5-rev3628-pdfas-1.1.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\itext-2.1.5-rev3628-pdfas-1.1.jar" SelfReg="false" NextFile="javase1.6SNAPSHOT.jar"/>

     <ROW File="javase1.6SNAPSHOT.jar" Component_="axis1.0.jar" FileName="javase~1.jar|javase-1.6-SNAPSHOT.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\javase-1.6-SNAPSHOT.jar" SelfReg="false" NextFile="jempbox0.8.0incubator.jar"/>

     <ROW File="jempbox0.8.0incubator.jar" Component_="axis1.0.jar" FileName="jempbo~1.jar|jempbox-0.8.0-incubator.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\jempbox-0.8.0-incubator.jar" SelfReg="false" NextFile="junit3.8.1.jar"/>

@@ -90,7 +90,7 @@
     <ROW File="slf4japi1.6.6.jar" Component_="axis1.0.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.6.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\slf4j-api-1.6.6.jar" SelfReg="false" NextFile="slf4jlog4j121.6.6.jar"/>

     <ROW File="slf4jlog4j121.6.6.jar" Component_="axis1.0.jar" FileName="slf4j-~2.jar|slf4j-log4j12-1.6.6.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\slf4j-log4j12-1.6.6.jar" SelfReg="false" NextFile="xercesImpl2.7.1.jar"/>

     <ROW File="swtwindows32.jar" Component_="swtwindows32.jar" FileName="swt-wi~1.jar|swt-windows-32.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib-swt\swt-windows-32.jar" SelfReg="false" NextFile="swtwindows64.jar"/>

-    <ROW File="swtwindows64.jar" Component_="swtwindows32.jar" FileName="swt-wi~2.jar|swt-windows-64.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib-swt\swt-windows-64.jar" SelfReg="false"/>

+    <ROW File="swtwindows64.jar" Component_="swtwindows32.jar" FileName="swt-wi~2.jar|swt-windows-64.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib-swt\swt-windows-64.jar" SelfReg="false" NextFile="icon.ico"/>

     <ROW File="xercesImpl2.7.1.jar" Component_="axis1.0.jar" FileName="xerces~1.jar|xercesImpl-2.7.1.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\xercesImpl-2.7.1.jar" SelfReg="false" NextFile="xmlapis1.3.02.jar"/>

     <ROW File="xmlapis1.3.02.jar" Component_="axis1.0.jar" FileName="xml-ap~1.jar|xml-apis-1.3.02.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\xml-apis-1.3.02.jar" SelfReg="false" NextFile="swtwindows32.jar"/>

   </COMPONENT>

@@ -134,9 +134,9 @@
   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiControlConditionComponent">

     <ROW Dialog_="ShortcutsDlg" Control_="StartupShorcutsCheckBox" Action="Hide" Condition="(Not Installed)"/>

-    <ROW Dialog_="ShortcutsDlg" Control_="StartmenuShortcutsCheckBox" Action="Hide" Condition="(Not Installed)"/>

     <ROW Dialog_="ShortcutsDlg" Control_="QuickLaunchShorcutsCheckBox" Action="Hide" Condition="(Not Installed) AND (VersionNT&lt;&quot;601&quot;)"/>

     <ROW Dialog_="ShortcutsDlg" Control_="DesktopShortcutsCheckBox" Action="Show" Condition="(Not Installed)"/>

+    <ROW Dialog_="ShortcutsDlg" Control_="StartmenuShortcutsCheckBox" Action="Hide" Condition="(Not Installed)"/>

     <ATTRIBUTE name="DeletedRows" value="ShortcutsDlg#StartmenuShortcutsCheckBox#Show#(Not Installed)@ShortcutsDlg#StartupShorcutsCheckBox#Show#(Not Installed)@ShortcutsDlg#DesktopShortcutsCheckBox#Show#(Not Installed)@ShortcutsDlg#QuickLaunchShorcutsCheckBox#Show#(Not Installed) AND (VersionNT&lt;&quot;601&quot;)"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">

@@ -221,7 +221,7 @@
   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">

     <ROW Shortcut="PDFOver" Directory_="DesktopFolder" Name="PDF-Over" Component_="PDFOver.exe" Target="[#PDFOver.exe]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>

-    <ROW Shortcut="ShortcuttoPDFOver.exe" Directory_="SHORTCUTDIR" Name="PDF-Over" Component_="PDFOver.exe" Target="[#PDFOver.exe]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>

+    <ROW Shortcut="PDFOver_1" Directory_="SHORTCUTDIR" Name="PDF-Over" Component_="PDFOver.exe" Target="[#PDFOver.exe]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">

     <ATTRIBUTE name="UsedTheme" value="classic"/>