Instalación y actualización por internet: puesta en marcha.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@238 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Build/Build.fbp5

@@ -46,25 +46,6 @@
             <Property name="RetryPauseInterval" type="Cardinal">1000</Property>
             <Property name="SuppressStatusMessages" type="Boolean">False</Property>
             </Object>
-          <Object Class="TCommentAction" XMLID="{63828BB3-822F-407F-B3B0-56F052E14690}"><Property MultiValue="0" name="ActionComment" type="string"></Property>
-            <Property MultiValue="1" name="ActionDescription" type="string"><![CDATA[# Compilación Administración de puntos de venta Varela]]>
-              </Property>
-            <Property name="ActionTextColor" type="Cardinal">16711680</Property>
-            <Property MultiValue="0" name="ActionTypeID" type="string"></Property>
-            <Property MultiValue="1" name="Description" type="string"><![CDATA[# Compilación Administración de puntos de venta Varela]]>
-              </Property>
-            <Property name="Enabled" type="WordBool">False</Property>
-            <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
-            <Property name="IgnoreFailure" type="WordBool">False</Property>
-            <Property name="IsAction" type="Boolean">True</Property>
-            <Property name="IsBreakPoint" type="WordBool">False</Property>
-            <Property MultiValue="0" name="LogToVariable" type="string"></Property>
-            <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
-            <Property name="NodeCollapsed" type="Boolean">False</Property>
-            <Property name="PauseInterval" type="Cardinal">0</Property>
-            <Property name="RetryPauseInterval" type="Cardinal">1000</Property>
-            <Property name="SuppressStatusMessages" type="Boolean">False</Property>
-            </Object>
           <Object Class="TCommentAction" XMLID="{BC5956A7-D316-4085-B7FB-03689AC3C01E}"><Property MultiValue="0" name="ActionComment" type="string"></Property>
             <Property MultiValue="0" name="ActionDescription" type="string">#</Property>
             <Property name="ActionTextColor" type="Cardinal">16711680</Property>

Build/Installer.fbv

@@ -0,0 +1 @@
+<variables><project_path><![CDATA[C:\Codigo Tecsitel]]></project_path></variables>

Installer/Actualizacion/Actualización.iss

@@ -1,99 +0,0 @@
-[Setup]
-AppName=FactuGES
-AppVerName=FactuGES 2.2.2
-AppPublisher=Rodax Software S.L.
-AppPublisherURL=http://www.rodax-software.com
-AppSupportURL=http://www.rodax-software.com
-AppUpdatesURL=http://www.rodax-software.com
-OutputBaseFilename=instalar
-Compression=lzma
-SolidCompression=yes
-CreateAppDir=no
-Uninstallable=no
-DisableStartupPrompt=yes
-DisableFinishedPage=yes
-
-[Languages]
-Name: "sp"; MessagesFile: "compiler:languages\Spanish.isl"
-
-[Files]
-Source: "files\*"; DestDir: {code:GetDir}; CopyMode: alwaysoverwrite; Flags:  uninsneveruninstall overwritereadonly
-;Source: "files\Informes\*"; DestDir: "{code:GetDir}\Informes\"; Flags: ignoreversion recursesubdirs createallsubdirs
-;Source: "files\Financiacion\*"; DestDir: "{code:GetDir}\Financiacion\"; Flags: ignoreversion recursesubdirs createallsubdirs
-
-[Registry]
-;Root: HKLM; Subkey: "Software\FactuGES\Update"; ValueType: string; ValueName: "edLocation_Text"; ValueData: "http://www.rodax-software.com/luisleon/update"; Flags: createvalueifdoesntexist
-
-[Code]
-var
-  TipoActualizacion : String;
-  Ruta : String;
-  VerAnterior : String;
-  VerNueva : String;
-
-function GetDir(Param: String): String;
-begin
-  Result := Ruta;
-end;
-
-procedure HacerBackupVerAnterior;
-var
-  RutaBack : String;
-  FindRec: TFindRec;
-begin
-  RutaBack := Ruta + 'Otras versiones\' + VerAnterior + '\';
-
-  ForceDirectories(RutaBack);
-  ForceDirectories(RutaBack + 'Informes');
-
-  FileCopy(Ruta + 'FactuGES.exe', RutaBack + 'FactuGES.exe', FALSE);
-  if FindFirst(ExpandConstant(Ruta + 'Informes\*.*'), FindRec) then begin
-    try
-      repeat
-        // Don't count directories
-        if FindRec.Attributes and FILE_ATTRIBUTE_DIRECTORY = 0 then
-          FileCopy(Ruta + 'Informes\' + FindRec.Name, RutaBack + 'Informes\' + FindRec.Name, FALSE);
-      until not FindNext(FindRec);
-    finally
-      FindClose(FindRec);
-    end;
-  end;
-end;
-
-{function NextButtonClick(CurPageID: Integer): Boolean;
-begin
-  if CurPageID = 1 then
-  begin
-    if not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\FactuGES\Update',
-      'TipoActualizacion', TipoActualizacion) then
-      Abort;
-      
-    if not DirExists(Ruta) then
-      Abort;
-      
-    if TipoActualizacion = 'INTERNET' then
-      HacerBackupVerAnterior();
-  end;
-  Result := True;
-end;}
-
-function InitializeSetup(): Boolean;
-var
-  p:  HWND;
-begin
-  // Comprobar que FactuGES no está en ejecución
-  p := FindWindowByWindowName('FactuGES');
-  if p > 0 then
-  begin
-    MsgBox('Debe salir de FactuGES para poder instalar esta actualización',mbInformation, MB_OK);
-    Result := False
-  end
-  else begin
-    // Comprobar que la ruta del programa está en el registro
-    Result := RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\FactuGES', 'Ruta', Ruta);
-  end;
-end;
-
-
-
-

Installer/factuges.iss

@@ -0,0 +1,62 @@
+[Setup]
+AppID={code:GetAppID|''}
+AppName=FactuGES2
+AppVerName=FactuGES2 v{code:GetAppVersion}
+AppPublisher=Rodax Software S.L.
+AppPublisherURL=http://www.rodax-software.com
+AppSupportURL=http://www.rodax-software.com
+AppUpdatesURL=http://www.rodax-software.com
+DefaultDirName={sd}\Rodax Software\FactuGES2
+DefaultGroupName=FactuGES2
+AllowNoIcons=true
+OutputDir=Output
+OutputBaseFilename=factuges2setup
+Compression=lzma
+SolidCompression=true
+InfoBeforeFile=
+InternalCompressLevel=ultra
+MinVersion=0,5.01.2600
+
+[Languages]
+Name: spanish; MessagesFile: compiler:Languages\Spanish.isl
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+
+[Files]
+Source: Input\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: version.dat
+Source: Input\update.ico; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: Input\version.dat; DestDir: {tmp}; Flags: dontcopy
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: {group}\FactuGES2; Filename: {app}\FactuGES.exe; WorkingDir: {app}
+Name: {userdesktop}\FactuGES2; Filename: {app}\FactuGES.exe; Tasks: desktopicon; WorkingDir: {app}; Languages: 
+Name: {group}\Comprobar actualizaciones; Filename: {app}\FactuGES.exe; WorkingDir: {app}; Parameters: CheckNow; Comment: Comprobar si hay nuevas actualizaciones de FactuGES2; IconFilename: {app}\update.ico
+Name: {group}\{cm:UninstallProgram,FactuGES2}; Filename: {uninstallexe}
+
+[Run]
+Filename: {app}\FactuGES.exe; Description: {cm:LaunchProgram,FactuGES2}; Flags: nowait postinstall skipifsilent
+
+[Registry]
+Root: HKLM; Subkey: Software\Rodax Software; ValueType: string; ValueName: Version; ValueData: {code:GetAppVersion|''}; Flags: uninsdeletekey
+
+[LangOptions]
+LanguageName=Spanish
+LanguageID=$0C0A
+
+[Code]
+function GetAppVersion(param: String): String;
+	var
+		AppVersion: String;
+	begin
+		ExtractTemporaryFile('version.dat');
+		LoadStringFromFile(ExpandConstant('{tmp}\version.dat'), AppVersion);
+		Result := AppVersion;
+	end;
+
+function GetAppID(param: String): String;
+	begin
+		Result := 'FactuGES2';
+	end;

Installer/librerias.txt

@@ -0,0 +1,75 @@
+ccpackD11.bpl
+cfpack_d11.bpl
+cxDataD11.bpl
+cxEditorsD11.bpl
+cxExportD11.bpl
+cxExtEditorsD11.bpl
+cxGridD11.bpl
+cxIntl6D11.bpl
+cxIntlPrintSys3D11.bpl
+cxLibraryD11.bpl
+cxPageControlD11.bpl
+DataAbstract_Core_D11.bpl
+dclcxLibraryD11.bpl
+dxBarD11.bpl
+dxBarExtItemsD11.bpl
+dxComnD11.bpl
+dxGDIPlusD11.bpl
+dxLayoutControlD11.bpl
+dxPSCoreD11.bpl
+dxPScxCommonD11.bpl
+dxPScxGrid6LnkD11.bpl
+dxPSLnksD11.bpl
+dxPsPrVwAdvD11.bpl
+dxThemeD11.bpl
+frx11.bpl
+frxe11.bpl
+frxTee11.bpl
+fs11.bpl
+fsTee11.bpl
+GUISDK_D11.bpl
+Jcl110.bpl
+JclVcl110.bpl
+JSDialog100.bpl
+JvAppFrmD11R.bpl
+JvCmpD11R.bpl
+JvCoreD11R.bpl
+JvCtrlsD11R.bpl
+JvCustomD11R.bpl
+JvDlgsD11R.bpl
+JvGlobusD11R.bpl
+JvJansD11R.bpl
+JvMMD11R.bpl
+JvPageCompsD11R.bpl
+JvStdCtrlsD11R.bpl
+JvSystemD11R.bpl
+pckMD5.bpl
+pckUCDataConnector.bpl
+pckUserControl_RT.bpl
+PluginSDK_D10R.bpl
+PngComponentsD10.bpl
+PNG_D10.bpl
+RemObjects_Core_D11.bpl
+tb2k_d10.bpl
+tbx_d10.bpl
+
+adortl100.bpl
+bdertl100.bpl
+dbrtl100.bpl
+dclIndyCore100.bpl
+designide100.bpl
+dsnap100.bpl
+IndyCore100.bpl
+IndyProtocols100.bpl
+IndySystem100.bpl
+rtl100.bpl
+tee7100.bpl
+teeUI7100.bpl
+vcl100.bpl
+vclactnband100.bpl
+vcldb100.bpl
+vcljpg100.bpl
+vclshlctrls100.bpl
+vclsmp100.bpl
+vclx100.bpl
+xmlrtl100.bpl

RodaxSoftware.FactuGES.proj

@@ -18,6 +18,7 @@
      <PropertyGroup>
 		<FBScriptFolder>$(MSBuildProjectDirectory)\Build</FBScriptFolder>
         <CodeFolder>$(MSBuildProjectDirectory)\Source</CodeFolder>
+        <InstallerFolder>$(MSBuildProjectDirectory)\Installer</InstallerFolder>
         <SqlFolder>$(MSBuildProjectDirectory)\Database</SqlFolder>
         <LibFolder>$(MSBuildProjectDirectory)\Lib</LibFolder>
         <InstallFolder>$(MSBuildProjectDirectory)\Install</InstallFolder>
@@ -127,13 +128,15 @@
      <PropertyGroup>
         <CleanDependsOn>
            $(CleanDependsOn);
-		    CleanDatabase
+		    	 CleanDatabase
            CleanCode
+           CleanInstaller
         </CleanDependsOn>
      </PropertyGroup>
   
      <ItemGroup>
-		<FBScriptFile Include="$(FBScriptFolder)\Build.fbp5" />
+		 		<FBBuildScriptFile Include="$(FBScriptFolder)\Build.fbp5" />
+		 		<FBInstallerScriptFile Include="$(FBScriptFolder)\Installer.fbp5" />
 		
         <SqlProjects Include="$(SqlFolder)\**\*.proj"/>
        
@@ -144,7 +147,7 @@
                     "tester1@sanlam.co.za;
                      tester2@sanlam.co.za" />
 					 
-		<FilesToDelete Include="$(CodeFolder)\**\*.dcu;
+		<BuildFilesToDelete Include="$(CodeFolder)\**\*.dcu;
 								$(CodeFolder)\**\*.dcp;
 								$(CodeFolder)\**\*.map;
 								$(CodeFolder)\**\*.dsk;
@@ -153,16 +156,20 @@
 								$(CodeFolder)\**\*.drc;
 								$(OutputPath)\**\*.*" 
 					   Exclude="$(OutputPath)\Database\*"/>
+					   
+		<InstallerFilesToDelete Include="$(InstallerFolder)\Input\*.*;
+								$(InstallerFolder)\Output\*.*"/>
+					   
 	</ItemGroup>
 
 
 
 	<Target Name="BuildDatabase">
 		<MSBuild Projects="@(SqlProjects)" 
-			Targets="$(BuildTargets)" 
+			Targets="Build" 
 			Properties="Configuration=$(Configuration);SqlCmdRunner=$(SqlCmdRunner);DBServer=$(DBServer);DBUser=$(DBUser);DBPassword=$(DBPassword);"/>
 	</Target>
-	 
+
 	<Target Name="ExtractDatabase">
 		<MSBuild Projects="@(SqlProjects)" 
 			Targets="Extract" 
@@ -177,11 +184,19 @@
 
 	 
    <Target Name="BuildCode">
-	  <Exec Command="$(DOUBLE_QUOTES)$(FinalBuilderCmd)$(DOUBLE_QUOTES) /p$(DOUBLE_QUOTES)@(FBScriptFile)$(DOUBLE_QUOTES) /b /c /s" />
+	  <Exec Command="$(DOUBLE_QUOTES)$(FinalBuilderCmd)$(DOUBLE_QUOTES) /p$(DOUBLE_QUOTES)@(FBBuildScriptFile)$(DOUBLE_QUOTES) /b /c /s" />
+   </Target>
+
+   <Target Name="BuildInstaller">
+	  <Exec Command="$(DOUBLE_QUOTES)$(FinalBuilderCmd)$(DOUBLE_QUOTES) /p$(DOUBLE_QUOTES)@(FBInstallerScriptFile)$(DOUBLE_QUOTES) /b /c /s" />
    </Target>
 	
    <Target Name="CleanCode">
-		<Delete Files="@(FilesToDelete)" ContinueOnError="false" />
+		<Delete Files="@(BuildFilesToDelete)" ContinueOnError="false" />
+   </Target>
+
+   <Target Name="CleanInstaller">
+		<Delete Files="@(InstallerFilesToDelete)" ContinueOnError="false" />
    </Target>
 	
 	
@@ -201,10 +216,10 @@
 	</Target>	 
 	 
 	<Target Name="BuildAll"
-		DependsOnTargets="BuildDatabase;BuildCode;BuildTests"/>
+		DependsOnTargets="BuildDatabase;BuildCode;BuildTests;BuildInstaller"/>
 		
 	<Target Name="CleanAll"
-		DependsOnTargets="CleanDatabase;CleanCode"/>
+		DependsOnTargets="CleanDatabase;CleanCode;CleanInstaller"/>
 
 	<Target Name="Rebuild"
 		DependsOnTargets="CleanCode;BuildCode"/>
@@ -218,12 +233,14 @@
 	    <Message Text="$(TAB)-> BuildDatabase$(TAB) - Generar la base de datos" />
 	    <Message Text="$(TAB)-> BuildCode$(TAB)$(TAB) - Compilar el codigo" />
 	    <Message Text="$(TAB)-> BuildTests$(TAB)$(TAB) - Sin uso" />
+	    <Message Text="$(TAB)-> BuildInstaller$(TAB)$(TAB) - Generar programa de instalacion" />
 
 		<Message Text=" " />
 
 		<Message Text="-> CleanAll" />
 	    <Message Text="$(TAB)-> CleanDatabase$(TAB) - Borrar la base de datos" />
 	    <Message Text="$(TAB)-> CleanCode$(TAB)$(TAB) - Borrar todo el codigo compilado (dcu, dcp, bpl y exe)" />
+	    <Message Text="$(TAB)-> CleanInstaller$(TAB)$(TAB) - Borrar el instalador generado y todos los ficheros de la aplicacion que contiene" />    
 	 
 		<Message Text=" " />
 
@@ -235,6 +252,8 @@
 
 		<Message Text="-> ExtractDatabase" />
 	    <Message Text="$(TAB)Extrae el metadata de la BD actual y lo deja en un script SQL" />
+	    
+		<Message Text=" " />
 	</Target> 
 	 
 </Project>