diff --git a/Build/Build.fbp5 b/Build/Build.fbp5 index 4c191fcf..7bc76529 100644 --- a/Build/Build.fbp5 +++ b/Build/Build.fbp5 @@ -46,25 +46,6 @@ 1000 False - - - - 16711680 - - - - False - True - False - True - False - - 0 - False - 0 - 1000 - False - # 16711680 diff --git a/Build/Installer.fbp5 b/Build/Installer.fbp5 new file mode 100644 index 00000000..b6f34430 --- /dev/null +++ b/Build/Installer.fbp5 @@ -0,0 +1,1216 @@ + + + + + + base.fbz5 + + + 0 + + + + False + True + Main + {4C1B4E5D-F42F-4877-9F28-41B527858954} + + FinalBuilderAction + 0 + + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + # + 16711680 + + # + False + True + False + True + False + + 0 + False + 0 + 1000 + False + + + # + 16711680 + + # + False + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + + 16711680 + + + + False + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + + 0 + + False + + + True + True + True + ftString + False + True + False + + 0 + smNone + %FBPROJECTDIR% + False + 0 + 1000 + False + project_path + + + + + 0 + {78526C82-A8E7-42B3-8C9D-1E229C79D915} + + + + + True + False + True + False + True + False + + 0 + False + 0 + 1000 + True + True + 2 + + True + True + + project_path + \Build + + False + False + True + + + + + 16711680 + + + + False + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + + 0 + + + + True + True + True + False + True + False + False + + 0 + False + 0 + 1000 + False + + + + + # + 16711680 + + # + False + True + False + True + False + + 0 + False + 0 + 1000 + False + + + # + 16711680 + + # + False + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + + 0 + + + + False + True + True + False + True + False + False + + 0 + 2 + False + 0 + 1000 + False + 0 + + + + 0 + + True + True + %output_path% + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + + 0 + + True + True + %inno_input_path% + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + + 0 + + True + True + + + True + True + False + %inno_input_path%\*.* + False + True + False + + 0 + False + 0 + 1000 + False + + + + + 0 + + True + True + + + True + True + False + %inno_output_path%\*.* + False + True + False + + 0 + False + 0 + 1000 + False + + + + + + 0 + + + + False + True + True + False + True + False + False + + 0 + 2 + False + 0 + 1000 + False + 0 + + + + 0 + + + + False + True + True + False + True + False + False + + 0 + 2 + False + 0 + 1000 + False + 0 + + + + 0 + + False + + + True + True + False + True + %output_path%\Cliente\FactuGES.exe + True + False + True + False + + 0 + False + False + 0 + False + 1000 + False + %inno_input_path%\_factuges.exe + False + + + + + 0 + + 39449 + False + False + False + False + False + False + False + False + False + False + + + %inno_input_path% + True + False + + + True + + + False + False + + False + + True + False + + 0 + False + False + False + False + 0 + 0 + tpNormal + 1000 + %output_path%\Cliente\*.bpl + False + True + 2 + False + False + logQuiet + mdNormal + + + + + 0 + + False + True + True + False + True + %project_path%\Resources\Iconos\update.ico + True + False + True + False + + 0 + False + False + 0 + False + 1000 + False + %inno_input_path% + True + + + + + + 0 + + + + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + True + False + True + lista_librerias_requeridas + %project_path%\Installer\librerias.txt + False + True + False + + 0 + False + 0 + True + 1000 + False + + + + + 0 + + + + True + True + False + True + False + + 0 + True + 0 + 1000 + False + + + + 0 + + + + True + True + False + _aux_path + False + True + False + + + lsCRLF + + 0 + False + 0 + 1000 + , + True + False + + + + 0 + + True + True + False + ListaTodasBPL + + False + True + False + + 0 + False + 0 + 1000 + False + %_aux_path% + + + ListaTodasBPL + qtNone + spNone + + False + PATTERNLIST + + False + *.bpl + True + + + EXCLUDEPATTERNLIST + + + + + + + + 0 + + True + True + lista_librerias_encontradas + ListaTodasBPL + False + True + False + + 0 + False + 0 + qtDouble + 1000 + + spCRLF + False + True + False + + + + + 0 + + True + True + ListaTodasBPL + False + True + False + + 0 + False + 0 + 1000 + False + + + + + 0 + + + + True + True + False + _aux_path + False + True + False + + + lsCRLF + + 0 + False + 0 + 1000 + , + True + False + + + + 0 + {097DBD39-9D4E-416B-A4B0-1FA0ED5FB081} + + + True + False + True + False + True + False + + 0 + False + 0 + 1000 + False + True + 2 + + False + True + _aux_filename + _aux_path + False + False + True + False + False + False + False + False + + False + + + False + True + + + + + 0 + + True + False + False + True + False + + + + 0 + False + + + 0 + 1000 + + + True + False + jwOr + + + + 0 + + False + True + True + False + True + %_aux_path% + True + False + True + False + + 0 + False + False + 0 + False + 1000 + False + %inno_input_path% + True + + + + + + + + + + + 0 + + + + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + True + True + + %inno_input_path%\_factuges.exe + False + True + False + + 0 + False + 0 + 1000 + False + + + + + + + 0 + + True + True + True + %inno_input_path%\version.dat + False + True + False + + 0 + %factuges_version% + False + 0 + 1000 + False + toStart + + + + + + 0 + + + + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + True + True + True + True + False + True + + + False + False + + False + + True + False + True + + 0 + False + + + 0 + 0 + tpNormal + %autoupdate_path%\configurator.exe + True + 1000 + rcEqualTo + 0 + + False + True + 1 + True + + + + 0 + + False + True + True + False + True + %updateclient_path%\FactuGES.exe + True + False + True + False + + 0 + False + False + 0 + False + 1000 + False + %inno_input_path% + True + + + + + + 0 + + True + True + False + Inno5 + True + False + + 0 + False + 0 + 1000 + %inno_input_path%\..\factuges.iss + True + False + + + + + + 0 + + + + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + True + True + %inno_output_path%\FactuGES2setup.exe + + + False + True + False + + 0 + False + 0 + 1000 + False + False + factuges_size + + + + + 0 + + + + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + + True + True + False + + False + True + False + + 0 + False + HighestMSXML + 0 + True + 1000 + False + True + sxText + UpdateConfig.xml + + + + + UpdateConfig.xml + + + + + + 0 + + + True + True + False + + False + True + False + + 0 + False + %inno_output_path%\UpdateConfig.xml + True + HighestMSXML + 0 + True + 1000 + False + True + UpdateConfig.xml + + + + + + + True + False + OnFailure + {BA6B406D-5FE5-4FF9-8D33-0459EBECDF95} + + FinalBuilderAction + 0 + + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + + Project + + %project_path%\Output\Debug + True + False + False + output_path + vtProject + + + + + False + True + False + project_path + vtProject + + + %DELPHI2007% + False + False + False + DELPHI + vtProject + + + %project_path%\Installer\Input + True + False + False + inno_input_path + vtProject + + + %project_path%\Installer\Output + True + False + False + inno_output_path + vtProject + + + + False + False + False + factuges_version + vtProject + + + %project_path%\Installer\UpdateClient + True + False + False + updateclient_path + vtProject + + + + False + False + False + factuges_size + vtProject + + + + + False + False + False + _aux_filename + vtProject + + + + False + False + False + _aux_path + vtProject + + + + False + False + False + lista_librerias_requeridas + vtProject + + + + False + False + False + lista_librerias_encontradas + vtProject + + + %ProgramFiles%\AutoUpdate+ + False + False + False + autoupdate_path + vtProject + + + + diff --git a/Build/Installer.fbv b/Build/Installer.fbv new file mode 100644 index 00000000..411786d2 --- /dev/null +++ b/Build/Installer.fbv @@ -0,0 +1 @@ + diff --git a/Installer/Actualizacion/Actualización.iss b/Installer/Actualizacion/Actualización.iss deleted file mode 100644 index acbc51b9..00000000 --- a/Installer/Actualizacion/Actualización.iss +++ /dev/null @@ -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; - - - - diff --git a/Installer/Actualizacion/Files/FactuGES.exe b/Installer/Actualizacion/Files/FactuGES.exe deleted file mode 100644 index 6dbab3ba..00000000 Binary files a/Installer/Actualizacion/Files/FactuGES.exe and /dev/null differ diff --git a/Installer/Actualizacion/Output/instalar.exe b/Installer/Actualizacion/Output/instalar.exe deleted file mode 100644 index 71bf12e8..00000000 Binary files a/Installer/Actualizacion/Output/instalar.exe and /dev/null differ diff --git a/Installer/factuges.aup b/Installer/factuges.aup new file mode 100644 index 00000000..a14d2559 Binary files /dev/null and b/Installer/factuges.aup differ diff --git a/Installer/factuges.iss b/Installer/factuges.iss new file mode 100644 index 00000000..3a915ec3 --- /dev/null +++ b/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; diff --git a/Installer/librerias.txt b/Installer/librerias.txt new file mode 100644 index 00000000..5d27cb99 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Resources/Iconos/update.ico b/Resources/Iconos/update.ico new file mode 100644 index 00000000..8daedfb5 Binary files /dev/null and b/Resources/Iconos/update.ico differ diff --git a/RodaxSoftware.FactuGES.proj b/RodaxSoftware.FactuGES.proj index 700ef589..453609d6 100644 --- a/RodaxSoftware.FactuGES.proj +++ b/RodaxSoftware.FactuGES.proj @@ -18,6 +18,7 @@ $(MSBuildProjectDirectory)\Build $(MSBuildProjectDirectory)\Source + $(MSBuildProjectDirectory)\Installer $(MSBuildProjectDirectory)\Database $(MSBuildProjectDirectory)\Lib $(MSBuildProjectDirectory)\Install @@ -127,13 +128,15 @@ $(CleanDependsOn); - CleanDatabase + CleanDatabase CleanCode + CleanInstaller - + + @@ -144,7 +147,7 @@ "tester1@sanlam.co.za; tester2@sanlam.co.za" /> - + + + - + - + + + + + - + + + + + @@ -201,10 +216,10 @@ + DependsOnTargets="BuildDatabase;BuildCode;BuildTests;BuildInstaller"/> + DependsOnTargets="CleanDatabase;CleanCode;CleanInstaller"/> @@ -218,12 +233,14 @@ + + @@ -235,6 +252,8 @@ + + \ No newline at end of file diff --git a/Tools/AutoUpdate+ v4.0.0.170/AutoUpdatePlus.exe b/Tools/AutoUpdate+ v4.0.0.170/AutoUpdatePlus.exe new file mode 100644 index 00000000..e6c4a476 Binary files /dev/null and b/Tools/AutoUpdate+ v4.0.0.170/AutoUpdatePlus.exe differ diff --git a/Tools/AutoUpdate+ v4.0.0.170/keymaker.exe b/Tools/AutoUpdate+ v4.0.0.170/keymaker.exe new file mode 100644 index 00000000..ae85dbcb Binary files /dev/null and b/Tools/AutoUpdate+ v4.0.0.170/keymaker.exe differ diff --git a/Tools/Inno Setup/isetup-5.2.2.exe b/Tools/Inno Setup/isetup-5.2.2.exe new file mode 100644 index 00000000..8e1fd7a5 Binary files /dev/null and b/Tools/Inno Setup/isetup-5.2.2.exe differ diff --git a/Tools/Inno Setup/istool-5.2.1.exe b/Tools/Inno Setup/istool-5.2.1.exe new file mode 100644 index 00000000..c596d51d Binary files /dev/null and b/Tools/Inno Setup/istool-5.2.1.exe differ diff --git a/Tools/ReDepend/ReDepend.exe b/Tools/ReDepend/ReDepend.exe new file mode 100644 index 00000000..f9d6309a Binary files /dev/null and b/Tools/ReDepend/ReDepend.exe differ