Permalink
Browse files

prepare 1.20.5

  • Loading branch information...
1 parent 9abdfe5 commit 5cf3b79df54bf14b589627f4137feb8eda40cc5b Tim Lebedkov committed Jun 26, 2015
View
@@ -1,10 +1,10 @@
-version: 1.20.4.{build}
+version: 1.20.5.{build}
branches:
only:
- master
clone_folder: c:\projects\Npackd
environment:
- version: 1.20.4
+ version: 1.20.5
matrix:
- bits: 64
prg: npackd
@@ -16,10 +16,10 @@
<ROW Property="ARPURLINFOABOUT" Value="http://code.google.com/p/windows-package-manager/"/>
<ROW Property="CTRLS" Value="2"/>
<ROW Property="Manufacturer" Value="Npackd" ValueLocId="*"/>
- <ROW Property="ProductCode" Value="1033:{F57F67B7-B446-4FCD-90A8-DD21B412B4EF} " Type="16"/>
+ <ROW Property="ProductCode" Value="1033:{C91F6305-8ED0-46E9-A796-BDEB983D377E} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="NpackdCL" ValueLocId="*"/>
- <ROW Property="ProductVersion" Value="1.20.4" Type="32"/>
+ <ROW Property="ProductVersion" Value="1.20.5" Type="32"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
<ROW Property="UpgradeCode" Value="{B57EADCE-24E8-4D80-8611-25F58745FA25}"/>
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -32,11 +32,11 @@
<ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
- <ROW Component="LICENSE.txt" ComponentId="{9B3CAAD0-9FA5-4A2E-94E2-8026C1157FC2}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSE.txt" Type="0"/>
- <ROW Component="ProductInformation" ComponentId="{07E1ADD7-9C36-46C5-9A6A-0FF23226D2DE}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
- <ROW Component="exchndl.dll" ComponentId="{5FC7261D-AA57-4374-AB15-4EDCD6F83511}" Directory_="APPDIR" Attributes="0" KeyPath="exchndl.dll"/>
- <ROW Component="ncl.exe" ComponentId="{A777339C-4D48-4161-95FE-2A41A24F81FE}" Directory_="APPDIR" Attributes="0" KeyPath="ncl.exe"/>
- <ROW Component="npackdcl.exe" ComponentId="{0176D4B7-AFBE-44D3-A702-E0E56F651F31}" Directory_="APPDIR" Attributes="0" KeyPath="npackdcl.exe"/>
+ <ROW Component="LICENSE.txt" ComponentId="{CFB73385-E11A-487C-A726-EC25BA9E9B5B}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSE.txt" Type="0"/>
+ <ROW Component="ProductInformation" ComponentId="{49ADC35E-0FE6-48E5-BCBD-7E13F264B4DE}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
+ <ROW Component="exchndl.dll" ComponentId="{3C2DFEA1-5BB3-43FB-ACF8-F763677E6850}" Directory_="APPDIR" Attributes="0" KeyPath="exchndl.dll"/>
+ <ROW Component="ncl.exe" ComponentId="{BDF37242-4340-48EE-97E9-8CF246CE2022}" Directory_="APPDIR" Attributes="0" KeyPath="ncl.exe"/>
+ <ROW Component="npackdcl.exe" ComponentId="{2351B06C-B722-4395-B56C-D6C28FE4CECF}" Directory_="APPDIR" Attributes="0" KeyPath="npackdcl.exe"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="LICENSE.txt ProductInformation exchndl.dll ncl.exe npackdcl.exe"/>
@@ -1271,6 +1271,13 @@ void PackageVersion::install(Job* job, const QString& where)
installationScripts.release();
if (job->shouldProceed()) {
+ QString err = InstalledPackages::getDefault()->setPackageVersionPath(
+ this->package, this->version, where);
+ if (!err.isEmpty())
+ job->setErrorMessage(err);
+ }
+
+ if (job->shouldProceed()) {
QString err = DBRepository::getDefault()->updateStatus(this->package);
if (!err.isEmpty())
job->setErrorMessage(err);
@@ -15,10 +15,10 @@
<ROW Property="ARPURLINFOABOUT" Value="http://code.google.com/p/windows-package-manager/"/>
<ROW Property="CTRLS" Value="2"/>
<ROW Property="Manufacturer" Value="Npackd" ValueLocId="*"/>
- <ROW Property="ProductCode" Value="1033:{FDB2B0E6-0591-4416-AA1B-D198B2BAE73E} " Type="16"/>
+ <ROW Property="ProductCode" Value="1033:{B0938E77-5999-4E5B-B526-AC24C016794F} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Npackd" ValueLocId="*"/>
- <ROW Property="ProductVersion" Value="1.20.4" Type="32"/>
+ <ROW Property="ProductVersion" Value="1.20.5" Type="32"/>
<ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
<ROW Property="UpgradeCode" Value="{EABC4270-7D7F-47BF-B388-AC63606E8DAC}"/>
@@ -35,10 +35,10 @@
<ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
- <ROW Component="LICENSE.txt" ComponentId="{4CCF80B9-98CA-449B-93F4-32F6677A1633}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSE.txt" Type="0"/>
- <ROW Component="SHORTCUTDIR" ComponentId="{E0C2ECAE-7769-468A-8D8F-31686090F1F6}" Directory_="SHORTCUTDIR" Attributes="0"/>
- <ROW Component="exchndl.dll" ComponentId="{833D3052-2C50-4626-9B9F-452925742E88}" Directory_="APPDIR" Attributes="0" KeyPath="exchndl.dll"/>
- <ROW Component="wpmcpp.exe" ComponentId="{4CA91040-4F63-4BF4-9E65-E17E0EE0C38C}" Directory_="APPDIR" Attributes="0" KeyPath="wpmcpp.exe"/>
+ <ROW Component="LICENSE.txt" ComponentId="{81819807-68D0-4255-8673-440508ACF7F8}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSE.txt" Type="0"/>
+ <ROW Component="SHORTCUTDIR" ComponentId="{A8452DB7-A6D5-4C8C-AAC5-7C3B4083A7D2}" Directory_="SHORTCUTDIR" Attributes="0"/>
+ <ROW Component="exchndl.dll" ComponentId="{132737B0-5F56-4059-BECC-4024C81C2079}" Directory_="APPDIR" Attributes="0" KeyPath="exchndl.dll"/>
+ <ROW Component="wpmcpp.exe" ComponentId="{3C7072A9-FC27-488A-ABB5-103631EA8F8F}" Directory_="APPDIR" Attributes="0" KeyPath="wpmcpp.exe"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="LICENSE.txt SHORTCUTDIR exchndl.dll wpmcpp.exe"/>
@@ -11,10 +11,10 @@
<ROW Property="ARPURLINFOABOUT" Value="http://code.google.com/p/windows-package-manager/"/>
<ROW Property="CTRLS" Value="2"/>
<ROW Property="Manufacturer" Value="Npackd" ValueLocId="*"/>
- <ROW Property="ProductCode" Value="1033:{6BB78389-AD0A-441F-B57C-98C6E3D15A04} " Type="16"/>
+ <ROW Property="ProductCode" Value="1033:{9FCF5672-ACE7-4DBD-9465-E2A26D140E83} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Npackd" ValueLocId="*"/>
- <ROW Property="ProductVersion" Value="1.20.4" Type="32"/>
+ <ROW Property="ProductVersion" Value="1.20.5" Type="32"/>
<ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
<ROW Property="UpgradeCode" Value="{EABC4270-7D7F-47BF-B388-AC63606E8DAC}"/>
@@ -31,9 +31,9 @@
<ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
- <ROW Component="LICENSE.txt" ComponentId="{6DD7394D-3547-4B4F-9279-71C07DB2A4B3}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSE.txt" Type="0"/>
- <ROW Component="SHORTCUTDIR" ComponentId="{66E6E0D6-1A93-4780-A435-DEED96D49190}" Directory_="SHORTCUTDIR" Attributes="0"/>
- <ROW Component="wpmcpp.exe" ComponentId="{B20AC8F3-805C-43C8-8E72-DBADDC4A959B}" Directory_="APPDIR" Attributes="0" KeyPath="wpmcpp.exe"/>
+ <ROW Component="LICENSE.txt" ComponentId="{4B613765-3D48-403C-969D-8F2C5CF682AF}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSE.txt" Type="0"/>
+ <ROW Component="SHORTCUTDIR" ComponentId="{846AD71D-3542-4DDE-A672-0D16AD2CC796}" Directory_="SHORTCUTDIR" Attributes="0"/>
+ <ROW Component="wpmcpp.exe" ComponentId="{4B28E1AA-9BF7-4619-AFBA-47E0314D8415}" Directory_="APPDIR" Attributes="0" KeyPath="wpmcpp.exe"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="LICENSE.txt SHORTCUTDIR wpmcpp.exe"/>
@@ -1754,13 +1754,13 @@ p, li { white-space: pre-wrap; }
<translation>Die Antivirus-Überprüfung is fehlgeschlagen. Diese Datei ist nicht sicher.</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1428"/>
+ <location filename="packageversion.cpp" line="1435"/>
<source>%1. Full output was saved in %2</source>
<translation>%1. Gesamte Ausgabe wurde in %2 gespeichert</translation>
</message>
<message>
<location filename="packageversion.cpp" line="579"/>
- <location filename="packageversion.cpp" line="1293"/>
+ <location filename="packageversion.cpp" line="1300"/>
<source>Deleting files</source>
<translation>Lösche Dateien</translation>
</message>
@@ -1905,7 +1905,7 @@ p, li { white-space: pre-wrap; }
<translation>Installationskript ausführen (dies kann einige Zeit dauern)</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1290"/>
+ <location filename="packageversion.cpp" line="1297"/>
<source>Deleting start menu, desktop and quick launch shortcuts</source>
<translation>Verknüpfungen aus Startmenü, Desktop und Schnellstartleiste löschen</translation>
</message>
@@ -1940,86 +1940,86 @@ p, li { white-space: pre-wrap; }
<translation>%L1 Dateien</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1359"/>
+ <location filename="packageversion.cpp" line="1366"/>
<source>Could not create file %1</source>
<translation>Kann Datei %1 nicht erstellen</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1364"/>
+ <location filename="packageversion.cpp" line="1371"/>
<source>Could not create directory %1</source>
<translation>Kann Verzeichnis %1 nicht erstellen</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1381"/>
+ <location filename="packageversion.cpp" line="1388"/>
<source>installed</source>
<translation>installiert</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1385"/>
+ <location filename="packageversion.cpp" line="1392"/>
<source>updateable</source>
<translation>aktualisierbar</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1387"/>
+ <location filename="packageversion.cpp" line="1394"/>
<source>obsolete</source>
<translation>veraltet</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1395"/>
+ <location filename="packageversion.cpp" line="1402"/>
<source>locked</source>
<translation>gesperrt</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1636"/>
+ <location filename="packageversion.cpp" line="1643"/>
<source>Process %1 exited with the code %2</source>
<translation>Prozess %1 wurde mit dem Code %2 beendet</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1613"/>
+ <location filename="packageversion.cpp" line="1620"/>
<source>%1 minutes</source>
<translation>%1 Minuten</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1433"/>
+ <location filename="packageversion.cpp" line="1440"/>
<source>%1. No output was generated</source>
<translation>%1. Keine Ausgabe wurde erzeugt</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1705"/>
+ <location filename="packageversion.cpp" line="1712"/>
<location filename="repositoryxmlhandler.cpp" line="307"/>
<source>Empty tag &lt;path&gt; under &lt;detect-file&gt;</source>
<translation>Leerer Tag &lt;path&gt; unterhalb von &lt;detect-file&gt;</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1712"/>
+ <location filename="packageversion.cpp" line="1719"/>
<location filename="repositoryxmlhandler.cpp" line="313"/>
<source>Wrong SHA1 in &lt;detect-file&gt;: </source>
<translation>Falscher SHA1 in &lt;detect-file&gt;:</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1754"/>
+ <location filename="packageversion.cpp" line="1761"/>
<source>Error in the attribute &apos;package&apos; in &lt;version&gt;: </source>
<translation>Fehler im Attribut &apos;package&apos; in &lt;version&gt;: </translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1769"/>
+ <location filename="packageversion.cpp" line="1776"/>
<location filename="repositoryxmlhandler.cpp" line="271"/>
<source>Not a valid download URL for %1: %2</source>
<translation>Keine gültige Download-Adresse für %1: %2</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1781"/>
+ <location filename="packageversion.cpp" line="1788"/>
<location filename="repositoryxmlhandler.cpp" line="135"/>
<source>Not a valid version for %1: %2</source>
<translation>Keine gültige Version für %1: %2</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1793"/>
+ <location filename="packageversion.cpp" line="1800"/>
<source>Invalid SHA1 for %1: </source>
<translation>Ungültige SHA1 für %1: </translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1823"/>
+ <location filename="packageversion.cpp" line="1830"/>
<source>Invalid SHA-1 for %1: </source>
<translation>Ungültige SHA-1 für %1: </translation>
</message>
@@ -2032,56 +2032,56 @@ p, li { white-space: pre-wrap; }
<translation type="vanished">Unbekannter Typ der Hash-Summe %1 für %2</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1836"/>
+ <location filename="packageversion.cpp" line="1843"/>
<source>Invalid SHA-256 for %1: </source>
<translation>Ungültige SHA-256 für %1: </translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1852"/>
+ <location filename="packageversion.cpp" line="1859"/>
<location filename="repositoryxmlhandler.cpp" line="149"/>
<source>Wrong value for the attribute &apos;type&apos; for %1: %3</source>
<translation>Falscher Wert für das Attribut &apos;type&apos; für %1: %3</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1867"/>
+ <location filename="packageversion.cpp" line="1874"/>
<location filename="repositoryxmlhandler.cpp" line="159"/>
<source>Empty &apos;path&apos; attribute value for &lt;important-file&gt; for %1</source>
<translation>Leerer &apos;path&apos;-Attributwert für &lt;important-file&gt; für %1</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1874"/>
+ <location filename="packageversion.cpp" line="1881"/>
<location filename="repositoryxmlhandler.cpp" line="165"/>
<source>More than one &lt;important-file&gt; with the same &apos;path&apos; attribute %1 for %2</source>
<translation>Mehr als ein &lt;important-file&gt; mit demselben &apos;path&apos;-Attribut %1 für %2</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1884"/>
+ <location filename="packageversion.cpp" line="1891"/>
<location filename="repositoryxmlhandler.cpp" line="177"/>
<source>Empty &apos;title&apos; attribute value for &lt;important-file&gt; for %1</source>
<translation>Leerer &apos;title&apos;-Attributwert für &lt;important-file&gt; für %1</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1913"/>
+ <location filename="packageversion.cpp" line="1920"/>
<source>Duplicate &lt;file&gt; entry for %1 in %2</source>
<translation>Doppelter &lt;file&gt;-Eintrag für %1 in %2</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1931"/>
+ <location filename="packageversion.cpp" line="1938"/>
<source>Invalid &lt;detect-file&gt; for %1: </source>
<translation>Ungültige Datei &lt;detect-file&gt; für %1: </translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1946"/>
+ <location filename="packageversion.cpp" line="1953"/>
<source>Duplicate &lt;detect-file&gt; entry for %1 in %2</source>
<translation>Doppelter &lt;detect-file&gt;-Eintrag für %1 in %2</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1975"/>
+ <location filename="packageversion.cpp" line="1982"/>
<source>Duplicate &lt;dependency&gt; for %1 in %2</source>
<translation>Doppeltes &lt;dependency&gt; für %1 in %2</translation>
</message>
<message>
- <location filename="packageversion.cpp" line="1993"/>
+ <location filename="packageversion.cpp" line="2000"/>
<source>Wrong MSI GUID for %1: %2</source>
<translation>Falsche MSI-GUID für %1: %2</translation>
</message>
Oops, something went wrong.

0 comments on commit 5cf3b79

Please sign in to comment.