research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump trunk version to 2.2a

Browse source
This commit is contained in:
Ray Speth 2013-12-09 01:33:58 +00:00
parent 9651b16b16
commit 6b68564245
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -3,7 +3,7 @@
CANTERA
*******
Version 2.1.0 (stable)
Version 2.2a (development)
License Information
===================

2
SConstruct
View file

@ -624,7 +624,7 @@ config_options = [
name recognized by the 'dot' program. On linux systems, this
should be lowercase 'helvetica'.""",
'Helvetica'),
('cantera_version', '', '2.1.0')
('cantera_version', '', '2.2a')
]
opts.AddVariables(*config_options)

2
configure.ac
View file

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT([cantera], [2.1.0], [nick@ices.utexas.edu])
AC_INIT([cantera], [2.2a], [nick@ices.utexas.edu])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR([build-aux])
#AX_ENABLE_BUILDDIR

4
doc/sphinx/conf.py
View file

@ -73,9 +73,9 @@ copyright = u'2012, Cantera Developers'
# built documents.
#
# The short X.Y version.
version = '2.1'
version = '2.2'
# The full version, including alpha/beta/rc tags.
release = '2.1.0'
release = '2.2a'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

10
site_scons/wxsgen.py
View file

@ -12,11 +12,11 @@ class WxsGenerator(object):
if self.x64:
self.CANTERA_UUID = uuid.UUID('F707EB9E-3723-11E1-A99F-525400631BAF')
self.pfilesName = 'ProgramFiles64Folder'
self.productName = 'Cantera 2.1 (64-bit)'
self.productName = 'Cantera 2.2 (64-bit)'
else:
self.CANTERA_UUID = uuid.UUID('1B36CAF0-279D-11E1-8979-001FBC085391')
self.pfilesName = 'ProgramFilesFolder'
self.productName = 'Cantera 2.1 (32-bit)'
self.productName = 'Cantera 2.2 (32-bit)'
def Directory(self, parent, Id, Name):
return et.SubElement(parent, 'Directory',
@ -76,14 +76,14 @@ class WxsGenerator(object):
UpgradeCode='2340BEE1-279D-11E1-A4AA-001FBC085391',
Language='1033',
Codepage='1252',
Version='2.1.0',
Version='2.2.0',
Manufacturer='Cantera Developers'))
fields = {'Platform': 'x64'} if self.x64 else {}
package = et.SubElement(product, "Package",
dict(Id='*',
Keywords='Installer',
Description="Cantera 2.1 Installer",
Description="Cantera 2.2 Installer",
InstallerVersion='310',
Languages='1033',
Compressed='yes',
@ -145,7 +145,7 @@ class WxsGenerator(object):
# Registry entries
reg_key = self.addRegistryKey(core, product, Id='CanteraRegRoot', Root='HKLM',
Key='Software\\Cantera\\Cantera 2.1',
Key='Software\\Cantera\\Cantera 2.2',
Action='createAndRemoveOnUninstall')
et.SubElement(reg_key, 'RegistryValue', dict(Type='string',
Name='InstallDir',