From 7379ddc200b5ba7f59b5fadedcf5d8ca3f8354bf Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 25 Jul 2023 10:27:30 +0200 Subject: [PATCH] Update psproj --- WAPT/control | 8 +-- WAPT/wapt.psproj | 152 ++++++++++++++--------------------------------- 2 files changed, 48 insertions(+), 112 deletions(-) diff --git a/WAPT/control b/WAPT/control index 3d04c36..56a326d 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,5 +1,5 @@ package : eht-add-dev-maturity -version : 4 +version : 5 architecture : all section : base priority : optional @@ -29,7 +29,7 @@ editor : keywords : licence : homepage : https://www.ehtrace.com -package_uuid : 6f68976e-ab2b-4e27-a3cf-7b4bdbe74b08 +package_uuid : ccc4e7ae-82c4-4825-a8c2-efd4113fb119 valid_from : valid_until : forced_install_on : @@ -39,6 +39,6 @@ max_os_version : icon_sha256sum : 611ac64556c71b79d18ea1cb1f624a7075a5f5e245ce04cd613de22d5829f2ac signer : dbd signer_fingerprint: e9156ec73f1ea6b50f33e0d9f580e8ae56db147100894bb5d2d4648a46f07ed1 -signature : OJS0UDOZa1ddamRDE1X+PaiLaBJv4gI4zFaq8cxTMEPs3FHHh/226caIi0/pHhkuMU2Mqp5m+0qTji0W+xgrbulb/VsrrNgUflTMPkCpSZdnDldWCykoAFF1batKIkdeIEDkWteKvLlnIdioeXKJV2k3xbES4OIxmjX9In0BR8pWn9HRxg8cUPFXCWNeinmWo/ldntBIzQ3X7pj5FBwmiRyEPWq2N2dT/6H1XHXdPwTONONrCvVbzCfPb9jHyIS39RUiVAXv3WqPykXytEMJJZ2DibGY3rBbOvL759r5rcAGUE4oZ0SClFHkAQdzPEwScvZR7ZUeO0bAPfeDSo3t5Q== -signature_date : 2023-04-05T15:28:18.831967 +signature : odAZ8k2FYxni/isVSiFHkqHl65I/rikXYhgjxC5ejKoJP4uT7f23cY0gP1aTV4GYCoWXz3rcSFg1zcBqbcOcPTJFTskjBETHJ8Z/gDKhxKy6t+Fmq1NbkLw/XVaVTWcw8y9Jc/vR9oZNzGC4PjyYktt7DINHiO9aVUlBx8XriaA7E2oPTEjbYYI3tZjeCB8LcjoIBMnm1GKZQG2Sxm1RoZAD+mij+ybOr3XehFKVqG8+JDqqvVsgVn6PlrVmIbXZKJjed/cYhXkwTZ8cuMzSg1WBHMk0ObCv8IZ0c9Fy08kPSpxMprT4tRxdZH10JHKiFbA17b0DPaIe3FkxDNY2SQ== +signature_date : 2023-07-20T11:07:01.488837 signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,description_pt,description_it,description_nl,description_ru,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,changelog,min_os_version,max_os_version,icon_sha256sum,signer,signer_fingerprint,signature_date,signed_attributes \ No newline at end of file diff --git a/WAPT/wapt.psproj b/WAPT/wapt.psproj index 29acc4b..2b2e008 100644 --- a/WAPT/wapt.psproj +++ b/WAPT/wapt.psproj @@ -1,5 +1,5 @@ [PyScripter] -Version=3.3.2.0 +Version=3.6.4.0 [Project] ClassName=TProjectRootNode @@ -23,43 +23,56 @@ FileName=C:\Program Files (x86)\wapt\setuphelpers.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2] ClassName=TProjectFileNode -FileName=C:\Program Files (x86)\wapt\wapt-get.ini +FileName=C:\Program Files (x86)\wapt\setuphelpers_linux.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3] ClassName=TProjectFileNode -FileName=C:\Program Files (x86)\wapt\wapt-get.py +FileName=C:\Program Files (x86)\wapt\setuphelpers_macos.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4] ClassName=TProjectFileNode +FileName=C:\Program Files (x86)\wapt\setuphelpers_unix.py + +[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node5] +ClassName=TProjectFileNode +FileName=C:\Program Files (x86)\wapt\setuphelpers_windows.py + +[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node6] +ClassName=TProjectFileNode +FileName=C:\Program Files (x86)\wapt\wapt-get.ini + +[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node7] +ClassName=TProjectFileNode +FileName=C:\Program Files (x86)\wapt\wapt-get.py + +[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node8] +ClassName=TProjectFileNode FileName=C:\Program Files (x86)\wapt\waptpackage.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes] -Count=5 +Count=9 [Project\ChildNodes\Node0\ChildNodes\Node1] ClassName=TProjectFileNode -FileName=$[Project-Path]changelog.txt - -[Project\ChildNodes\Node0\ChildNodes\Node2] -ClassName=TProjectFileNode FileName=$[Project-Path]control -[Project\ChildNodes\Node0\ChildNodes\Node3] +[Project\ChildNodes\Node0\ChildNodes\Node2] ClassName=TProjectFileNode FileName=$[Project-Path]..\setup.py [Project\ChildNodes\Node0\ChildNodes] -Count=4 +Count=3 [Project\ChildNodes\Node1] ClassName=TProjectRunConfiguationsNode [Project\ChildNodes\Node1\ChildNodes\Node0] ClassName=TProjectRunConfiguationNode -Name=install +Name=WAPT: install [Project\ChildNodes\Node1\ChildNodes\Node0\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch package installation. EngineType=peRemote ReinitializeBeforeRun=TRUE Parameters=install "$[Project-Path].." @@ -74,15 +87,14 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node1] ClassName=TProjectRunConfiguationNode -Name=remove +Name=WAPT: remove [Project\ChildNodes\Node1\ChildNodes\Node1\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch uninstallation (the uninstallation code found in local wapt database, remember to launch after an installation). EngineType=peRemote ReinitializeBeforeRun=TRUE Parameters=remove "$[Project-Path].." @@ -97,18 +109,17 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node2] ClassName=TProjectRunConfiguationNode -Name=session-setup +Name=WAPT: uninstall [Project\ChildNodes\Node1\ChildNodes\Node2\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch uninstallation code (for debugging purpose, it only runs the code of uninstall function). EngineType=peRemote ReinitializeBeforeRun=TRUE -Parameters=session-setup "$[Project-Path].." +Parameters=uninstall "$[Project-Path].." WorkingDir=$[Project-Path].. WriteOutputToFile=FALSE OutputFileName=$[ActiveScript-NoExt].log @@ -119,19 +130,18 @@ Caption=External Run Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] -WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] +WorkingDirectory=$[Project-Path].. [Project\ChildNodes\Node1\ChildNodes\Node3] ClassName=TProjectRunConfiguationNode -Name=update +Name=WAPT: session-setup [Project\ChildNodes\Node1\ChildNodes\Node3\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch session-setup (it runs directly as current user). EngineType=peRemote ReinitializeBeforeRun=TRUE -Parameters=update +Parameters=session-setup "$[Project-Path].." WorkingDir=$[Project-Path].. WriteOutputToFile=FALSE OutputFileName=$[ActiveScript-NoExt].log @@ -143,19 +153,18 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node4] ClassName=TProjectRunConfiguationNode -Name=upgrade +Name=WAPT: audit [Project\ChildNodes\Node1\ChildNodes\Node4\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch package audit. EngineType=peRemote ReinitializeBeforeRun=TRUE -Parameters=-f upgrade -WorkingDir=$[ActiveScript-Dir] +Parameters=audit -f "$[Project-Path].." +WorkingDir=$[Project-Path].. WriteOutputToFile=FALSE OutputFileName=$[ActiveScript-NoExt].log AppendToFile=FALSE @@ -166,18 +175,17 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node5] ClassName=TProjectRunConfiguationNode -Name=-i build-upload +Name=WAPT: update-package [Project\ChildNodes\Node1\ChildNodes\Node5\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch update_package (it usually serve to update binaries of the package). EngineType=peRemote ReinitializeBeforeRun=TRUE -Parameters=-i build-upload "$[Project-Path].." +Parameters=update-package-sources "$[Project-Path].." WorkingDir=$[Project-Path].. WriteOutputToFile=FALSE OutputFileName=$[ActiveScript-NoExt].log @@ -189,18 +197,17 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes\Node6] ClassName=TProjectRunConfiguationNode -Name=svn update +Name=WAPT: -i build-upload [Project\ChildNodes\Node1\ChildNodes\Node6\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Build and upload package to the waptserver. EngineType=peRemote ReinitializeBeforeRun=TRUE -Parameters=sources "$[Project-Path].." +Parameters=--use-gui -i build-upload "$[Project-Path].." WorkingDir=$[Project-Path].. WriteOutputToFile=FALSE OutputFileName=$[ActiveScript-NoExt].log @@ -212,80 +219,9 @@ Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] - -[Project\ChildNodes\Node1\ChildNodes\Node7] -ClassName=TProjectRunConfiguationNode -Name=uninstall - -[Project\ChildNodes\Node1\ChildNodes\Node7\RunConfig] -ScriptName=C:\Program Files (x86)\wapt\wapt-get.py -EngineType=peRemote -ReinitializeBeforeRun=TRUE -Parameters=uninstall "$[Project-Path].." -WorkingDir=$[Project-Path].. -WriteOutputToFile=FALSE -OutputFileName=$[ActiveScript-NoExt].log -AppendToFile=FALSE - -[Project\ChildNodes\Node1\ChildNodes\Node7\RunConfig\ExternalRun] -Caption=External Run -Description=Run script using an external Python Interpreter -ApplicationName=$[PythonExe-Short] -Parameters=$[ActiveScript-Short] -WorkingDirectory=$[Project-Path].. -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] - -[Project\ChildNodes\Node1\ChildNodes\Node8] -ClassName=TProjectRunConfiguationNode -Name=update-package-sources - -[Project\ChildNodes\Node1\ChildNodes\Node8\RunConfig] -ScriptName=C:\Program Files (x86)\wapt\wapt-get.py -EngineType=peRemote -ReinitializeBeforeRun=TRUE -Parameters=update-package-sources "$[Project-Path].." -WorkingDir=$[Project-Path].. -WriteOutputToFile=FALSE -OutputFileName=$[ActiveScript-NoExt].log -AppendToFile=FALSE - -[Project\ChildNodes\Node1\ChildNodes\Node8\RunConfig\ExternalRun] -Caption=External Run -Description=Run script using an external Python Interpreter -ApplicationName=$[PythonExe-Short] -Parameters=$[ActiveScript-Short] -WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] - -[Project\ChildNodes\Node1\ChildNodes\Node9] -ClassName=TProjectRunConfiguationNode -Name=audit - -[Project\ChildNodes\Node1\ChildNodes\Node9\RunConfig] -ScriptName=C:\Program Files (x86)\wapt\wapt-get.py -EngineType=peRemote -ReinitializeBeforeRun=TRUE -Parameters=audit "$[Project-Path].." -WorkingDir=$[Project-Path].. -WriteOutputToFile=FALSE -OutputFileName=$[ActiveScript-NoExt].log -AppendToFile=FALSE - -[Project\ChildNodes\Node1\ChildNodes\Node9\RunConfig\ExternalRun] -Caption=External Run -Description=Run script using an external Python Interpreter -ApplicationName=$[PythonExe-Short] -Parameters=$[ActiveScript-Short] -WorkingDirectory=$[ActiveScript-Dir] -ShortCut=0 -MessagesFormat=$[FileName] $[LineNumber] [Project\ChildNodes\Node1\ChildNodes] -Count=10 +Count=7 [Project\ChildNodes] Count=2