Permalink
Browse files

do not wait for child jobs by default

  • Loading branch information...
1 parent 92cfff7 commit 9abdfe54bfc3c894af513c82d828a57a13f58828 Tim Lebedkov committed Jun 21, 2015
Showing with 25 additions and 22 deletions.
  1. +3 −2 appveyor.yml
  2. +7 −7 npackdcl/src/NpackdCL32.aip
  3. +1 −1 wpmcpp/src/job.cpp
  4. +3 −1 wpmcpp/src/job.h
  5. +6 −6 wpmcpp/src/wpmcpp32.aip
  6. +5 −5 wpmcpp/src/wpmcpp64.aip
View
@@ -1,10 +1,10 @@
-version: 1.20.3.{build}
+version: 1.20.4.{build}
branches:
only:
- master
clone_folder: c:\projects\Npackd
environment:
- version: 1.20.3
+ version: 1.20.4
matrix:
- bits: 64
prg: npackd
@@ -23,3 +23,4 @@ build_script:
- AppVeyorBuild.bat
test_script:
- AppVeyorTest.bat
+
@@ -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:{26BB8DB3-6112-4DEE-9CF9-1B03EF523C30} " Type="16"/>
+ <ROW Property="ProductCode" Value="1033:{F57F67B7-B446-4FCD-90A8-DD21B412B4EF} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="NpackdCL" ValueLocId="*"/>
- <ROW Property="ProductVersion" Value="1.20.3" Type="32"/>
+ <ROW Property="ProductVersion" Value="1.20.4" 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="{40B8E795-7B2F-492D-B4FE-3E4645465FC4}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSE.txt" Type="0"/>
- <ROW Component="ProductInformation" ComponentId="{C29374FE-D1B2-4001-A3EA-32C4C469F0AC}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
- <ROW Component="exchndl.dll" ComponentId="{80D2FF74-A184-4ADC-A881-D5BD09BF76FD}" Directory_="APPDIR" Attributes="0" KeyPath="exchndl.dll"/>
- <ROW Component="ncl.exe" ComponentId="{29D1A709-E814-4AD0-A616-883EFC35B154}" Directory_="APPDIR" Attributes="0" KeyPath="ncl.exe"/>
- <ROW Component="npackdcl.exe" ComponentId="{B578C3CF-3BDF-4A0E-B0EF-0A5CB0CBD336}" Directory_="APPDIR" Attributes="0" KeyPath="npackdcl.exe"/>
+ <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"/>
</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"/>
View
@@ -80,7 +80,7 @@ void Job::waitForChildren()
void Job::complete()
{
- waitForChildren();
+ // waitForChildren();
bool completed_;
this->mutex.lock();
View
@@ -114,6 +114,8 @@ public slots:
* This must be called in order to complete the job regardless of
* setProgress, errors or cancellation state.
*
+ * This method does not wait to child jobs.
+ *
* @threadsafe
*/
void complete();
@@ -254,7 +256,7 @@ public slots:
time_t getStarted();
/**
- * @brief waitFor waits till this job is completed
+ * @brief waitFor waits till this job and all its children are completed
*/
void waitFor();
@@ -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:{71B98980-B114-4DBB-A6CE-9828986926B6} " Type="16"/>
+ <ROW Property="ProductCode" Value="1033:{FDB2B0E6-0591-4416-AA1B-D198B2BAE73E} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Npackd" ValueLocId="*"/>
- <ROW Property="ProductVersion" Value="1.20.3" Type="32"/>
+ <ROW Property="ProductVersion" Value="1.20.4" 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="{F75BB2EB-CE63-49E8-99D9-4E27C42255F4}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSE.txt" Type="0"/>
- <ROW Component="SHORTCUTDIR" ComponentId="{0F553F64-8A40-498A-924E-FE8060F1F060}" Directory_="SHORTCUTDIR" Attributes="0"/>
- <ROW Component="exchndl.dll" ComponentId="{C0CA6CB5-5AED-45D4-8789-FBB62042B0C9}" Directory_="APPDIR" Attributes="0" KeyPath="exchndl.dll"/>
- <ROW Component="wpmcpp.exe" ComponentId="{313D6961-E724-4D7A-A5B7-4C57F3BE65E4}" Directory_="APPDIR" Attributes="0" KeyPath="wpmcpp.exe"/>
+ <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"/>
</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:{A0465F54-2830-4E46-97A7-14E0AD7A67E9} " Type="16"/>
+ <ROW Property="ProductCode" Value="1033:{6BB78389-AD0A-441F-B57C-98C6E3D15A04} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Npackd" ValueLocId="*"/>
- <ROW Property="ProductVersion" Value="1.20.3" Type="32"/>
+ <ROW Property="ProductVersion" Value="1.20.4" 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="{85734690-B474-455A-9916-2D43520C60DD}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSE.txt" Type="0"/>
- <ROW Component="SHORTCUTDIR" ComponentId="{AA3C02AC-D3FB-4751-AE9C-44F09F90D207}" Directory_="SHORTCUTDIR" Attributes="0"/>
- <ROW Component="wpmcpp.exe" ComponentId="{5B6C7463-5629-45EC-B781-9BA913AB3777}" Directory_="APPDIR" Attributes="0" KeyPath="wpmcpp.exe"/>
+ <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"/>
</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"/>

0 comments on commit 9abdfe5

Please sign in to comment.