Skip to content
Snippets Groups Projects
Commit b4384ba7 authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

BAVersion is included in the git, changes in release script.

parent a5f47392
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ project(BornAgain) ...@@ -9,7 +9,7 @@ project(BornAgain)
# --- The version number --- # --- The version number ---
set(BornAgain_VERSION_MAJOR 0) set(BornAgain_VERSION_MAJOR 0)
set(BornAgain_VERSION_MINOR 9) set(BornAgain_VERSION_MINOR 9)
set(BornAgain_VERSION_PATCH 6) set(BornAgain_VERSION_PATCH 7)
# --- General project settings --- # --- General project settings ---
option(BORNAGAIN_PYTHON "Build with python support" ON) option(BORNAGAIN_PYTHON "Build with python support" ON)
......
// ************************************************************************** //
//
// BornAgain: simulate and fit scattering at grazing incidence
//
//! @file Samples/inc/BAVersion.h
//! @brief Defines functions for access to the package version number.
//
//! Homepage: apps.jcns.fz-juelich.de/BornAgain
//! License: GNU General Public License v3 or higher (see COPYING)
//! @copyright Forschungszentrum Jülich GmbH 2013
//! @authors Scientific Computing Group at MLZ Garching
//! @authors C. Durniak, G. Pospelov, W. Van Herck, J. Wuttke
//
// ************************************************************************** //
#ifndef BAVERSION_H_
#define BAVERSION_H_
#include <string>
#include <sstream>
namespace BornAgain {
const int major_version_number = 0;
const int minor_version_number = 9;
const int patch_version_number = 6;
inline int GetMajorVersionNumber() { return major_version_number; }
inline int GetMinorVersionNumber() { return minor_version_number; }
inline int GetPatchVersionNumber() { return patch_version_number; }
inline std::string GetName() { return std::string("BornAgain"); }
inline std::string GetVersionNumber()
{
std::ostringstream ostr;
ostr << major_version_number
<< "."
<< minor_version_number
<< "."
<< patch_version_number ;
return ostr.str();
}
}
#endif /* BAVERSION_H_ */
...@@ -5,7 +5,7 @@ project(UserManual NONE) ...@@ -5,7 +5,7 @@ project(UserManual NONE)
# user manual version number will be automatically propagated into tes # user manual version number will be automatically propagated into tes
set(UM_VERSION_MAJOR 0) set(UM_VERSION_MAJOR 0)
set(UM_VERSION_MINOR 2) set(UM_VERSION_MINOR 2)
set(UM_VERSION_PATCH 4) set(UM_VERSION_PATCH 5)
set(LATEX_COMPILER_FLAGS set(LATEX_COMPILER_FLAGS
......
...@@ -45,7 +45,6 @@ def get_manual_name(): ...@@ -45,7 +45,6 @@ def get_manual_name():
for line in fin: for line in fin:
if "UM_VERSION" in line: if "UM_VERSION" in line:
str = line.replace("(", "").replace(")", "") str = line.replace("(", "").replace(")", "")
#str = str.replace(")", "")
numbers.append([int(s) for s in str.split() if s.isdigit()][0]) numbers.append([int(s) for s in str.split() if s.isdigit()][0])
return "UserManual-%s.%s.%s.pdf" % (numbers[0], numbers[1], numbers[2]) return "UserManual-%s.%s.%s.pdf" % (numbers[0], numbers[1], numbers[2])
...@@ -106,6 +105,7 @@ def update_upload_dir(): ...@@ -106,6 +105,7 @@ def update_upload_dir():
print "Updating directory for upload ..." print "Updating directory for upload ..."
run_command("mv %s/BornAgain*.tar.gz %s/old" % (get_upload_dir(), get_upload_dir())) run_command("mv %s/BornAgain*.tar.gz %s/old" % (get_upload_dir(), get_upload_dir()))
run_command("mv %s/BornAgain*-win32.exe %s/old" % (get_upload_dir(), get_upload_dir())) run_command("mv %s/BornAgain*-win32.exe %s/old" % (get_upload_dir(), get_upload_dir()))
run_command("mv %s/UserManual-*.pdf %s/old" % (get_upload_dir(), get_upload_dir()))
run_command("cp %s/BornAgain-%s.tar.gz %s" % (get_build_dir(), get_version(), get_upload_dir())) run_command("cp %s/BornAgain-%s.tar.gz %s" % (get_build_dir(), get_version(), get_upload_dir()))
run_command("cp %s/CHANGELOG %s" % (get_source_dir(), get_upload_dir())) run_command("cp %s/CHANGELOG %s" % (get_source_dir(), get_upload_dir()))
run_command("cp %s/Doc/UserManual/UserManual.pdf %s/%s" % (get_build_dir(), get_upload_dir(), get_manual_name()) ) run_command("cp %s/Doc/UserManual/UserManual.pdf %s/%s" % (get_build_dir(), get_upload_dir(), get_manual_name()) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment