Skip to content

Commit 551ad41

Browse files
committed
Added Kinec_v3.dat to dist
Updated Guids for database components (both phreeqc3 & phreeqci) Update .gitignore
1 parent d6bba1c commit 551ad41

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

.gitignore

+15
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,18 @@
5151
# /msi/
5252
/msi/bin
5353
/msi/obj
54+
55+
# ignore directories beginning with '_'
56+
_*/
57+
58+
# backup files
59+
*~
60+
.vshistory/
61+
62+
# Precompiled Headers
63+
*.gch
64+
*.pch
65+
*.ipch
66+
67+
# Visual Studio cache directory
68+
.vs/

msi/Product.wxs

+2-1
Original file line numberDiff line numberDiff line change
@@ -274,14 +274,15 @@
274274
<Component Id="phreeqc.dat" Guid="*">
275275
<File Id="phreeqc.dat" Name="phreeqc.dat" Source="..\phreeqc3\database\phreeqc.dat" />
276276
</Component>
277-
<Component Id="AddDatabaseFiles" Guid="12E1A0AF-ADDD-4a15-B3B6-D927D0759F05">
277+
<Component Id="AddDatabaseFiles" Guid="A3E27904-3B1D-4721-86B3-400B738B56E5">
278278
<File Id="Amm.dat" Name="Amm.dat" Source="..\phreeqc3\database\Amm.dat" />
279279
<File Id="ColdChem.dat" Name="ColdChem.dat" Source="..\phreeqc3\database\ColdChem.dat" />
280280
<File Id="Concrete_PHR.dat" Name="Concrete_PHR.dat" Source="..\phreeqc3\database\Concrete_PHR.dat" />
281281
<File Id="Concrete_PZ.dat" Name="Concrete_PZ.dat" Source="..\phreeqc3\database\Concrete_PZ.dat" />
282282
<File Id="core10.dat" Name="core10.dat" Source="..\phreeqc3\database\core10.dat" />
283283
<File Id="frezchem.dat" Name="frezchem.dat" Source="..\phreeqc3\database\frezchem.dat" />
284284
<File Id="iso.dat" Name="iso.dat" Source="..\phreeqc3\database\iso.dat" />
285+
<File Id="Kinec_v3.dat" Name="Kinec_v3.dat" Source="..\phreeqc3\database\Kinec_v3.dat" />
285286
<File Id="Kinec.v2.dat" Name="Kinec.v2.dat" Source="..\phreeqc3\database\Kinec.v2.dat" />
286287
<File Id="llnl.dat" Name="llnl.dat" Source="..\phreeqc3\database\llnl.dat" />
287288
<File Id="minteq.dat" Name="minteq.dat" Source="..\phreeqc3\database\minteq.dat" />

phreeqc3/msi/Product.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129

130130
<!-- database -->
131131
<DirectoryRef Id="database">
132-
<Component Id="database" Guid="7D6149A8-11F7-4edf-ABC6-FF6944B18E72">
132+
<Component Id="database" Guid="4DFE9A0D-CDDA-4CA8-8E1D-B4D852A83CEC">
133133
<File Id="Amm.dat" Name="Amm.dat" Source="..\database\Amm.dat" />
134134
<File Id="ColdChem.dat" Name="ColdChem.dat" Source="..\database\ColdChem.dat" />
135135
<File Id="Concrete_PHR.dat" Name="Concrete_PHR.dat" Source="..\database\Concrete_PHR.dat" />

0 commit comments

Comments
 (0)