Narvaling
/
Olivia_v2017
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cambio de versión y añadida forma de comprobar licencia

Gerardo/estandarizacion
Elena 2023-01-18 00:09:58 +01:00
parent e9ae1a3301
commit 3e01a1ffa1
7 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Olivia.sln
View File

@ -4,11 +4,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 16.0.30011.22
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Olivia", "Olivia\Olivia.vcxproj", "{192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}"
ProjectSection(ProjectDependencies) = postProject
{04E5B10E-5A75-48A2-857B-805659C7877D} = {04E5B10E-5A75-48A2-857B-805659C7877D}
{AA58C828-7025-4A4C-868E-76B8902AF6BB} = {AA58C828-7025-4A4C-868E-76B8902AF6BB}
{22EEEE5A-0A71-4655-B57F-5FB8E1692389} = {22EEEE5A-0A71-4655-B57F-5FB8E1692389}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OliviaTasks", "OliviaTasks\OliviaTasks.vcxproj", "{A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utiles", "..\utiles\utiles.vcxproj", "{AA58C828-7025-4A4C-868E-76B8902AF6BB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientLic", "..\ClientLic\ClientLic.vcxproj", "{22EEEE5A-0A71-4655-B57F-5FB8E1692389}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "licUtiles", "..\licUtiles\licUtiles.vcxproj", "{04E5B10E-5A75-48A2-857B-805659C7877D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -41,6 +50,22 @@ Global
{AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|Win32.Build.0 = Release|Win32
{AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|x64.ActiveCfg = Release|x64
{AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|x64.Build.0 = Release|x64
{22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Debug|Win32.ActiveCfg = Debug|Win32
{22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Debug|Win32.Build.0 = Debug|Win32
{22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Debug|x64.ActiveCfg = Debug|x64
{22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Debug|x64.Build.0 = Debug|x64
{22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Release|Win32.ActiveCfg = Release|Win32
{22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Release|Win32.Build.0 = Release|Win32
{22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Release|x64.ActiveCfg = Release|x64
{22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Release|x64.Build.0 = Release|x64
{04E5B10E-5A75-48A2-857B-805659C7877D}.Debug|Win32.ActiveCfg = Debug|Win32
{04E5B10E-5A75-48A2-857B-805659C7877D}.Debug|Win32.Build.0 = Debug|Win32
{04E5B10E-5A75-48A2-857B-805659C7877D}.Debug|x64.ActiveCfg = Debug|x64
{04E5B10E-5A75-48A2-857B-805659C7877D}.Debug|x64.Build.0 = Debug|x64
{04E5B10E-5A75-48A2-857B-805659C7877D}.Release|Win32.ActiveCfg = Release|Win32
{04E5B10E-5A75-48A2-857B-805659C7877D}.Release|Win32.Build.0 = Release|Win32
{04E5B10E-5A75-48A2-857B-805659C7877D}.Release|x64.ActiveCfg = Release|x64
{04E5B10E-5A75-48A2-857B-805659C7877D}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

8
Olivia/Olivia.rc
View File

@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,6
PRODUCTVERSION 2,0,0,6
FILEVERSION 3,1,0,0
PRODUCTVERSION 3,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -46,12 +46,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "VSM"
VALUE "FileDescription", "Librería de la aplicación Olivia"
VALUE "FileVersion", "2.0.0.6"
VALUE "FileVersion", "3.1.0.0"
VALUE "InternalName", "Olivia.dll"
VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved."
VALUE "OriginalFilename", "Olivia.dll"
VALUE "ProductName", "OLIVIA"
VALUE "ProductVersion", "2.0.0.6"
VALUE "ProductVersion", "3.1.0.0"
END
END
BLOCK "VarFileInfo"

4
Olivia/Olivia.vcxproj
View File

@ -166,7 +166,7 @@ copy ..\..\lib\$(IntDir)utiles.lib ..\lib\$(IntDir)
copy ..\..\bin\$(IntDir)LicUtiles.dll ..\bin\$(IntDir)
copy ..\..\lib\$(IntDir)LicUtiles.lib ..\lib\$(IntDir)
copy ..\..\bin\$(IntDir)ClientLic.dll ..\bin\$(IntDir)
copy ..\..\ib\$(IntDir)ClientLic.lib ..\lib\$(IntDir)
copy ..\..\lib\$(IntDir)ClientLic.lib ..\lib\$(IntDir)
copy ..\..\bin\$(IntDir)FileTransfer.dll ..\bin\$(IntDir)
copy ..\..\lib\$(IntDir)FileTransfer.lib ..\lib\$(IntDir)
copy ..\..\bin\$(IntDir)sqlite3.dll ..\bin\$(IntDir)
@ -284,7 +284,7 @@ copy ..\..\lib\$(IntDir)utiles.lib ..\lib\$(IntDir)
copy ..\..\bin\$(IntDir)LicUtiles.dll ..\bin\$(IntDir)
copy ..\..\lib\$(IntDir)LicUtiles.lib ..\lib\$(IntDir)
copy ..\..\bin\$(IntDir)ClientLic.dll ..\bin\$(IntDir)
copy ..\..\ib\$(IntDir)ClientLic.lib ..\lib\$(IntDir)
copy ..\..\lib\$(IntDir)ClientLic.lib ..\lib\$(IntDir)
copy ..\..\bin\$(IntDir)FileTransfer.dll ..\bin\$(IntDir)
copy ..\..\lib\$(IntDir)FileTransfer.lib ..\lib\$(IntDir)
copy ..\..\bin\$(IntDir)sqlite3.dll ..\bin\$(IntDir)

6
Olivia/olv.cpp
View File

@ -274,7 +274,11 @@ BOOL COlivia::pon_config(char *config)
ya_config=TRUE;
olvlog(LOG_TODO, "olv", "Config %s", config);
////////////////////////////////////////////////
/*char config_log[1000];
sprintf_s(config_log, 1000, config);
olvlog(LOG_TODO, "olv", "Config %s", config_log);*/
////////////////////////////////////////////////
if(strstr(config,OliviaDef::GeneralDef::SockConfPlan))
modo_ejec=OLV_EJEC_PLAN;

3
OliviaTasks/OliviaTasks.cpp
View File

@ -29,6 +29,7 @@
CWinApp theApp;
using namespace std;
#define NOMBRE_PRODUCTO "OliviaTasks_3_1.exe"
BOOL coge_param(char *cmdline, OlvTaskProcess *task);
@ -85,7 +86,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm
Cdir_manager::dir_anterior(strtem);
sprintf(lic.dirLic,"%s\\", strtem);
sprintf(lic.dirTemp,"%s\\", app->log.path);
if(!lic.cargaLicencia())
if(!lic.cargaLicencia(NOMBRE_PRODUCTO))
{
C_log::log("_tmain", "Error al comprobar versión");
#ifdef _DEBUG

8
OliviaTasks/OliviaTasks.rc
View File

@ -82,8 +82,8 @@ MAINICON ICON "favicon.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,6
PRODUCTVERSION 2,0,0,6
FILEVERSION 3,1,0,0
PRODUCTVERSION 3,1,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -100,12 +100,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "VSM"
VALUE "FileDescription", "Launcher de la aplicación Olivia"
VALUE "FileVersion", "2.0.0.6"
VALUE "FileVersion", "3.1.0.0"
VALUE "InternalName", "OliviaTasks"
VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved."
VALUE "OriginalFilename", "OliviaTasks.exe"
VALUE "ProductName", "OliviaTasks"
VALUE "ProductVersion", "2.0.0.6"
VALUE "ProductVersion", "3.1.0.0"
END
END
BLOCK "VarFileInfo"

2
includes/ClientLic/ClienteLicencias.h
View File

@ -20,7 +20,7 @@ public:
ClienteLicencias(void);
~ClienteLicencias(void);
bool cargaLicencia();
bool cargaLicencia(char* nombreProducto=NULL);
virtual bool getClave(char* clave, char* producto );