diff --git a/Doc/UserManual/UserManual.pdf b/Doc/UserManual/BornAgainManual.pdf similarity index 98% rename from Doc/UserManual/UserManual.pdf rename to Doc/UserManual/BornAgainManual.pdf index 2158890867ee8d6a9d127acf72daec51fc8e89c9..7c9593ddb686a64249f612f7e8770ab61a23727a 100644 Binary files a/Doc/UserManual/UserManual.pdf and b/Doc/UserManual/BornAgainManual.pdf differ diff --git a/Doc/UserManual/UserManual.tex b/Doc/UserManual/BornAgainManual.tex similarity index 100% rename from Doc/UserManual/UserManual.tex rename to Doc/UserManual/BornAgainManual.tex diff --git a/Doc/UserManual/CMakeLists.txt b/Doc/UserManual/CMakeLists.txt index 9daaa5a4693a42a573a3b3108fe2b62eb3f621a9..dcb9fddf91ae599f3fbabef73d3b7f9532f31038 100644 --- a/Doc/UserManual/CMakeLists.txt +++ b/Doc/UserManual/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR) -project(UserManual NONE) +project(BornAgainManual NONE) # user manual version number will be automatically propagated into tes set(UM_VERSION_MAJOR 0) @@ -187,7 +187,7 @@ file(GLOB tex_inputs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.tex) #file(GLOB tex_inputs "*.tex") message("XXX ${tex_inputs}") -ADD_LATEX_DOCUMENT(UserManual.tex +ADD_LATEX_DOCUMENT(BornAgainManual.tex INPUTS ${tex_inputs} BIBFILES jw7.bib IMAGES ${UM_IMAGES} diff --git a/cmake/modules/UseLATEX.cmake b/cmake/modules/UseLATEX.cmake index d8bab3d59573dacf6ff6717562586131798a1b55..c69da71d3a920b68a5fd1c61f1b7dc916c81a7f0 100644 --- a/cmake/modules/UseLATEX.cmake +++ b/cmake/modules/UseLATEX.cmake @@ -571,7 +571,7 @@ FUNCTION(LATEX_SETUP_VARIABLES) DVIPS_CONVERTER PS2PDF_CONVERTER PDFTOPS_CONVERTER - LATEX2HTML_CONVERTER +# LATEX2HTML_CONVERTER ) LATEX_NEEDIT(LATEX_COMPILER latex) diff --git a/dev-tools/release/utils/common.py b/dev-tools/release/utils/common.py index 4d695584f0bc549914d2d445b2a7ba38e8655905..1b57e4d7ebd05a4f48281a4480013ced1de2981e 100644 --- a/dev-tools/release/utils/common.py +++ b/dev-tools/release/utils/common.py @@ -69,7 +69,7 @@ def get_manual_name(): if "UM_VERSION" in line: str = line.replace("(", "").replace(")", "") 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 "BornAgainManual-%s.%s.%s.pdf" % (numbers[0], numbers[1], numbers[2]) def run_command(cmd): diff --git a/dev-tools/release/utils/prepare_release.py b/dev-tools/release/utils/prepare_release.py index 69fbcb3e1d528606cc086a6410c80ad4fedbbb38..7d0fc0b7e84b0d2f152a991f7b32b38886e6302b 100644 --- a/dev-tools/release/utils/prepare_release.py +++ b/dev-tools/release/utils/prepare_release.py @@ -61,10 +61,10 @@ def update_upload_dir(): print "\nUpdating directory for upload ..." 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/UserManual-*.pdf %s/old" % (get_upload_dir(), get_upload_dir())) + run_command("mv %s/*Manual-*.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/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/BornAgainManual.pdf %s/%s" % (get_build_dir(), get_upload_dir(), get_manual_name()) ) def prepare_release():