Skip to content

Commit

Permalink
Merge pull request #29 from ComparativeGenomicsToolkit/static
Browse files Browse the repository at this point in the history
fix release script
  • Loading branch information
glennhickey authored Aug 19, 2020
2 parents 8e0fdd3 + cd489bf commit 4318f3c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
12 changes: 5 additions & 7 deletions build-tools/makeBinRelease
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash
# Generate release tar file static-compiled binaries
# Generate release hal2vg binary
# Must have a static buildable hdf5 (ie not the one from apt)
# Must be run after tree is tagged and pushed to master.
# Use --keep to keep working directory for debugging.

Expand Down Expand Up @@ -30,12 +31,9 @@ git submodule update --init --recursive
if [ $(man gcc | grep nehalem | wc -l) -ge 1 ]
then
# attempt to increase portability by using older architecture
CFLAGS="-march=nehalem" CXXFLAGS="-march=nehalem" make -j $(nproc) check-static
CFLAGS="-march=nehalem" CXXFLAGS="-march=nehalem" make check-static
else
make -j $(nproc) check-static
make check-static
fi

binPackageDir=hal2vg-bin-${REL_TAG}
rm -rf ${binPackageDir}
mkdir ${binPackageDir}
cp hal2vg ${binPackageDir}
cp hal2vg ${buildDir}/
2 changes: 1 addition & 1 deletion build-tools/makeSrcRelease
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ git fetch --tags origin
REL_TAG=$(getLatestReleaseTag)
git checkout "${REL_TAG}"
git submodule update --init --recursive
find submodules -name ".git" -exec rm -Rf "{}" \;
find deps -name ".git" -exec rm -Rf "{}" \;
cd ..
mv hal2vg hal2vg-${REL_TAG}
tar -czf ${buildDir}/hal2vg-${REL_TAG}.tar.gz hal2vg-${REL_TAG}
Expand Down

0 comments on commit 4318f3c

Please sign in to comment.