From 96838bf61b067a8edf015c8bb4c3db12e7befc96 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Sat, 20 Dec 2025 02:11:14 -0600 Subject: [PATCH] =?UTF-8?q?VERSION=205.12.16=20-=20Se=20agreg=C3=B3=20coma?= =?UTF-8?q?ndo=20y=20script=20para=20enviar=20autom=C3=A1ticamente=20el=20?= =?UTF-8?q?TAG=20con=20la=20version=20actual=20a=20GitHub.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/B4XMainPage.bas | 2 ++ B4A/KelloggsV4.b4a | 2 +- B4A/KelloggsV4.b4a.meta | 4 ++-- B4A/_git_tag.ps1 | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 32c98a0..e6c7e15 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -18,7 +18,9 @@ Version=9.85 '###################### PUSH TORTOISE GIT ######################################################### 'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../../"&Args=/closeonend:2 '########################################################################################################### + '###################### PUSH TORTOISE GIT CON TAG ################################################## 'Ctrl + clic para Git: ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=-ExecutionPolicy&Args=Bypass&Args=-File&Args=..\_git_tag.ps1&Args=%22%PROJECT%%22&Args=%22%PROJECT_NAME%%22 + '########################################################################################################### #End Region 'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=github&Args=..\..\ diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index 14a2193..fea0529 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -917,7 +917,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 5.12.15.test + #VersionName: 5.12.16 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 57aa6a6..07afdf3 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -100,6 +100,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Principal,cargar_Click,1031,0,Subs,modTrendSpending,2210,3,C_TrendSpending,modTrendSpending,112,2,C_Productos,B4XPage_Appear,236,0,C_TrendSpending,traeDescXSku,59,0,C_TrendSpending,traeInfoTrendSpending,73,2,C_Principal,JobDone,2240,0,Main,Activity_Create,43,0,B4XMainPage,Class_Globals,119,0,B4XMainPage,Initialize,127,0 +NavigationStack=C_Principal,cargar_Click,1031,0,Subs,modTrendSpending,2210,3,C_TrendSpending,modTrendSpending,112,2,C_Productos,B4XPage_Appear,236,0,C_TrendSpending,traeDescXSku,59,0,C_TrendSpending,traeInfoTrendSpending,73,2,C_Principal,JobDone,2240,0,Main,Activity_Create,43,0,B4XMainPage,Class_Globals,119,0,B4XMainPage,Initialize,122,0 SelectedBuild=0 -VisibleModules=31,1,12,3,32,13,14,20,19,33,16 +VisibleModules=31,1,12,3,32,13,14,20,19,33 diff --git a/B4A/_git_tag.ps1 b/B4A/_git_tag.ps1 index 113de0b..e5a2e88 100644 --- a/B4A/_git_tag.ps1 +++ b/B4A/_git_tag.ps1 @@ -43,7 +43,7 @@ Write-Host "Abriendo TortoiseGit..." # Argumentos limpios $pathArg = '/path:"{0}"' -f $projectPath -$msgArg = '/logmsg:"Version {0}"' -f $version +$msgArg = '/logmsg:"VERSION {0}"' -f $version $cmdArg = "/command:commit" $process = Start-Process "TortoiseGitProc.exe" -ArgumentList $cmdArg, $pathArg, $msgArg -Wait -PassThru @@ -74,7 +74,7 @@ if ($remoteTagInfo) { [System.Console]::Beep(1000, 200) - $msgBody = "El tag '$tagName' YA EXISTE en GitHub.`n`nDeseas SOBRESCRIBIRLO?`n`nSi = Borrar anterior y actualizar (Force Push).`nNo = Subir solo codigo (mantener tag viejo)." + $msgBody = "El tag '$tagName' YA EXISTE en GitHub.`n`n¿Deseas SOBRESCRIBIRLO?`n`nSí = Borrar anterior y actualizar (Force Push).`nNo = Subir solo código (mantener tag viejo)." $msgTitle = "⚠️ Conflicto de Versiones - $projectName" # El mensaje ahora es "hijo" del formulario invisible, heredando su propiedad TopMost