From 018b5eb70ed13e68a8fbef1b37a69e0250f1758f Mon Sep 17 00:00:00 2001 From: José Maria Villac Pinheiro Date: Tue, 21 Jun 2022 15:01:22 -0300 Subject: [PATCH] Alterado o caminho de instalação, pois ao exportar para o EPANET, conforme a liguagem do Windows apresentava erro Path not found. --- install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------- trunk/GeoSan.vbp | 4 ++-- trunk/Modules/Global.bas | 2 +- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss b/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss index 68ada1c..6adb0ca 100644 --- a/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss +++ b/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss @@ -1,5 +1,5 @@ #define SetupBaseName "SetupGeoSan-v." -#define AppVersionFile "08.02.02" +#define AppVersionFile "08.03.00" [Setup] AppName=GeoSan @@ -14,7 +14,7 @@ VersionInfoVersion={#AppVersionFile} VersionInfoTextVersion=GeoSan {#AppVersionFile} AppCopyright=NEXUS GeoEngenharia -DefaultDirName=C:\Arquivos de Programas\GeoSan +DefaultDirName=C:\Program Files\GeoSan DefaultGroupName=GeoSan UninstallDisplayIcon={app}\GeoSan.exe AppMutex=GeoSan @@ -127,57 +127,57 @@ Source: "ArquivosInstGeoSan\vcredist_x86.exe"; DestDir: {tmp}; Flags: deleteafte ; CopyMode: alwaysoverwrite para sobrescrever tudo ;ARQUIVOS TERRALIB 4.2.0 - ******************************************************************************************************************* -Source: "ArquivosInstGeoSan\TeCom4.2.0\fbclient.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\gdal110.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\geotiff.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\iconv.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\intl.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\libeay32.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\libexpat.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\libiconv-2.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\libintl-2.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\libmysql.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\libpq.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\libtiff.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\msadox.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\msvcr71.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\oci.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\oledb32.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\oraociicus10.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\qt-mt338.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\qwt500.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\ssleay32.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\terralib.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\terralib_ado.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\terralib_shp.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\terralib_spl.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\fbclient.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\gdal110.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\geotiff.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\iconv.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\intl.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\libeay32.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\libexpat.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\libiconv-2.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\libintl-2.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\libmysql.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\libpq.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\libtiff.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\msadox.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\msvcr71.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\oci.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\oledb32.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\oraociicus10.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\qt-mt338.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\qwt500.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\ssleay32.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\terralib.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\terralib_ado.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\terralib_shp.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\terralib_spl.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; ; dos antigos -Source: "ArquivosInstGeoSan\TeCom4.2.0\ijl15.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\libiconv2.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\libxml2.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\msjava.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\msvcp80.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\msvcp80d.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\msvcr80.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\shapelib.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\SIBPRO2.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\tiff.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\zlib.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; -Source: "ArquivosInstGeoSan\TeCom4.2.0\zlib1.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\ijl15.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\libiconv2.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\libxml2.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\msjava.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\msvcp80.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\msvcp80d.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\msvcr80.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\shapelib.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\SIBPRO2.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\tiff.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\zlib.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; +Source: "ArquivosInstGeoSan\TeCom4.2.0\zlib1.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; ; dos antigos -;Source: "ArquivosInstGeoSan\TeCom4.2.0\TECOMP~1.oca"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror - -Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComCanvas.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror -Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComConnection.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror -Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComDatabase.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror -Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComExport.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror -Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComGeometry.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror -Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComImport.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror -Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComNetwork.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror -Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComPrinter.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror -Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComViewDatabase.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror -Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComViewManager.dll"; DestDir: "C:\Arquivos de Programas\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror +;Source: "ArquivosInstGeoSan\TeCom4.2.0\TECOMP~1.oca"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror + +Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComCanvas.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror +Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComConnection.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror +Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComDatabase.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror +Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComExport.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror +Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComGeometry.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror +Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComImport.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror +Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComNetwork.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror +Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComPrinter.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror +Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComViewDatabase.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror +Source: "ArquivosInstGeoSan\TeCom4.2.0\TeComViewManager.dll"; DestDir: "C:\Program Files\NEXUS\TeCom4.2.0"; CopyMode: alwaysoverwrite; Flags: regserver noregerror ;ARQUIVOS NEXUS - ************************************************************************************************************************* Source: "ArquivosInstGeoSan\GeoSan.exe"; DestDir: "{app}"; CopyMode: alwaysoverwrite; diff --git a/trunk/GeoSan.vbp b/trunk/GeoSan.vbp index 48fa82b..52dc3d8 100644 --- a/trunk/GeoSan.vbp +++ b/trunk/GeoSan.vbp @@ -152,8 +152,8 @@ Name="GeoSan" HelpContextID="0" CompatibleMode="0" MajorVer=8 -MinorVer=2 -RevisionVer=2 +MinorVer=3 +RevisionVer=0 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." diff --git a/trunk/Modules/Global.bas b/trunk/Modules/Global.bas index 6acc606..1f954c0 100644 --- a/trunk/Modules/Global.bas +++ b/trunk/Modules/Global.bas @@ -201,7 +201,7 @@ Public Sub Main() End If 'Configura a versão atual do GeoSan Versao_Geo = App.Major & "." & App.Minor & "." & App.Revision - Versao_Geo = "08.02.02" + Versao_Geo = "08.03.00" glo.diretorioGeoSan = App.path 'salva globalmente o caminho onde encontra-se o GeoSan.exe SaveLoadGlobalData glo.diretorioGeoSan + "/controles/variaveisGlobais.txt", True 'salva em um arquivo todas as variáveis globais para poderem ser acessadas por outras aplicações connn = "" -- libgit2 0.21.2