Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename VERSION to BOWTIE2_VERSION #302

Merged
merged 1 commit into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions BOWTIE2_VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.4.2
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
cmake_policy(SET CMP0048 NEW)
cmake_policy(SET CMP0005 NEW)

file(STRINGS ${CMAKE_SOURCE_DIR}/VERSION PROJECT_VERSION)
file(STRINGS ${CMAKE_SOURCE_DIR}/BOWTIE2_VERSION PROJECT_VERSION)
project(bowtie2 LANGUAGES CXX VERSION ${PROJECT_VERSION})

enable_testing()
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ BUILD_CPPS := diff_sample.cpp
BUILD_CPPS_MAIN := $(BUILD_CPPS) bowtie_build_main.cpp

SEARCH_FRAGMENTS := $(wildcard search_*_phase*.c)
VERSION := $(shell cat VERSION)
VERSION := $(shell cat BOWTIE2_VERSION)

SANITIZER_FLAGS :=
ifeq (0,$(shell $(CXX) -E -fsanitize=address,undefined btypes.h > /dev/null 2>&1; echo $$?))
Expand Down Expand Up @@ -282,7 +282,7 @@ GENERAL_LIST := $(wildcard scripts/*.sh) \
MANUAL.markdown \
README.md \
TUTORIAL \
VERSION
BOWTIE2_VERSION

ifeq (1,$(WINDOWS))
BOWTIE2_BIN_LIST := $(BOWTIE2_BIN_LIST) bowtie2.bat bowtie2-build.bat bowtie2-inspect.bat
Expand Down Expand Up @@ -321,7 +321,7 @@ both-debug: bowtie2-align-s-debug bowtie2-build-s-debug bowtie2-align-l-debug bo
both-sanitized: bowtie2-align-s-sanitized bowtie2-build-s-sanitized bowtie2-align-l-sanitized bowtie2-build-l-sanitized ;

DEFS := -fno-strict-aliasing \
-DBOWTIE2_VERSION="\"`cat VERSION`\"" \
-DBOWTIE2_VERSION="\"`cat BOWTIE2_VERSION`\"" \
-DBUILD_HOST="\"${HOSTNAME:-`hostname`}\"" \
-DBUILD_TIME="\"`date -u`\"" \
-DCOMPILER_VERSION="\"`$(CXX) -v 2>&1 | tail -1`\"" \
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

2 changes: 1 addition & 1 deletion doc/release.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Prerequisites:
changed.
- TODO! Need infrastructure for this.

5. Update VERSION with new version number if this hasn't already been done.
5. Update BOWTIE2_VERSION with new version number if this hasn't already been done.

6. Update NEWS and doc/website/recent_news.ssi if this hasn't already been
done. (And even if it has, make sure the release date mentioned in those
Expand Down