Skip to content

Fix typo + improve reproducible builds #12

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.

Sign up for GitHub

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

Open
daissi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix typo + improve reproducible builds #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7763cc2
Fix typo
daissi Sep 29, 2018
632291b
Make builds reproducible
daissi Sep 29, 2018
ed47248
Restore default behavior for 'date'
daissi Oct 1, 2018
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
18 changes: 16 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,22 @@ cmake_minimum_required(VERSION 3.2)
project(minimac4 VERSION 1.0.1)

set(CMAKE_CXX_STANDARD 11)
execute_process(COMMAND date OUTPUT_VARIABLE DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND whoami OUTPUT_VARIABLE USER OUTPUT_STRIP_TRAILING_WHITESPACE)
if (DEFINED ENV{SOURCE_DATE_EPOCH})
execute_process(
COMMAND "date" "-u" "-d" "@$ENV{SOURCE_DATE_EPOCH}" "+%Y-%m-%d"
OUTPUT_VARIABLE DATE
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(USER "Reproducible")
else ()
execute_process(
COMMAND "date"
OUTPUT_VARIABLE DATE
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(
COMMAND "whoami"
OUTPUT_VARIABLE USER
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif ()

add_definitions(-DVERSION="${PROJECT_VERSION}" -DUSER="${USER}" -DDATE="${DATE}")

Expand Down
2 changes: 1 addition & 1 deletion src/HaplotypeSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ bool HaplotypeSet::ScaffoldGWAStoReference(HaplotypeSet &rHap, AllVariable& MyAl
{

cout << "\n ERROR !!! \n No overlap between Target and Reference markers !!!\n";
cout << " Please check for consistent marker identifer in reference and target input files..\n";
cout << " Please check for consistent marker identifier in reference and target input files..\n";
cout << "\n Program Exiting ... \n\n";
return false;

Expand Down
8 changes: 4 additions & 4 deletions src/MarkovParameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ void MarkovParameters::CopyParameters(MarkovParameters & rhs)

if(noMarker!=rhs.noMarker)
{
cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Incosistent number of markers ...\n";
cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Inconsistent number of markers ...\n";
cout<<" Contact Author for more details ...\n";
cout<<" Program Exiting ...\n\n";
abort();
Expand All @@ -154,7 +154,7 @@ void MarkovParameters::CopyParameters(MarkovParameters * rhs)

if(noMarker!=rhs->noMarker)
{
cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Incosistent number of markers ...\n";
cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Inconsistent number of markers ...\n";
cout<<" Contact Author for more details ...\n";
cout<<" Program Exiting ...\n\n";
abort();
Expand All @@ -173,7 +173,7 @@ void MarkovParameters::CopyParametersNew(MarkovParameters * rhs)

// if(noMarker!=rhs->noMarker)
// {
// cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Incosistent number of markers ...\n";
// cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Inconsistent number of markers ...\n";
// cout<<" Contact Author for more details ...\n";
// cout<<" Program Exiting ...\n\n";
// abort();
Expand All @@ -195,7 +195,7 @@ MarkovParameters & MarkovParameters::operator += (const MarkovParameters & rhs)

if(noMarker!=rhs.noMarker)
{
cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Incosistent number of markers ...\n";
cout<<"\n\n Run Time Error !!! Markov Parameters cannot be copied. Inconsistent number of markers ...\n";
cout<<" Contact Author for more details ...\n";
cout<<" Program Exiting ...\n\n";
abort();
Expand Down