diff --git a/README b/README index 2ad7a5051..f3a4806da 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ CANTERA ******* -Version 2.1.0 (stable) +Version 2.2a (development) License Information =================== diff --git a/SConstruct b/SConstruct index 8779a727e..3327062e9 100644 --- a/SConstruct +++ b/SConstruct @@ -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) diff --git a/configure.ac b/configure.ac index 0250c21da..fc47622b5 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index 29f6bb5ae..dc9bb1726 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -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. diff --git a/site_scons/wxsgen.py b/site_scons/wxsgen.py index 8c7909901..6c5607c3c 100644 --- a/site_scons/wxsgen.py +++ b/site_scons/wxsgen.py @@ -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',