From a48fbf476e4466a5332031928fc399b23e468aba Mon Sep 17 00:00:00 2001 From: Cristina Yenyxe Gonzalez Garcia Date: Thu, 14 Feb 2013 10:56:11 +0100 Subject: [PATCH] Scripts corrected for tarball and RPM generation Former-commit-id: 78b8027169bbc14bad82784adff9dd12046132bf --- SConstruct | 4 ++-- libs/bioinfo-libs | 2 +- rpm/hpg-variant.spec | 2 +- test/SConscript | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SConstruct b/SConstruct index 53560e6..90ea7e5 100644 --- a/SConstruct +++ b/SConstruct @@ -49,14 +49,14 @@ t = SConscript("test/SConscript", exports = ['env', 'debug', 'commons_path', 'bi # For the packaging manager: Don't forget to point the XXX_INCLUDE_PATH and XXX_LIBRARY_PATH # variables to the application libraries folder!! tb = env.Package(NAME = 'hpg-variant', - VERSION = '0.2.1', + VERSION = '0.3', PACKAGEVERSION = 0, PACKAGETYPE = 'src_targz', source = env.FindSourceFiles() + env.FindHeaderFiles(progs) + [ '#libs/libargtable2.a', '#libs/libcprops.a', Glob('#include/*.h'), Glob('#include/cprops/*.h'), '#buildaux.py', '#buildvars.py', '#libs/common-libs/buildvars.py', '#libs/bioinfo-libs/buildvars.py', - '#deb/SConscript', '#rpm/SConscript', + '#deb/SConscript', '#rpm/SConscript', '#rpm/hpg-variant.spec', '#COPYING', '#INSTALL' ] ) Alias('tarball', tb) diff --git a/libs/bioinfo-libs b/libs/bioinfo-libs index 00e0526..dead2cc 160000 --- a/libs/bioinfo-libs +++ b/libs/bioinfo-libs @@ -1 +1 @@ -Subproject commit 00e052680be7811fb49584484b5370835bd3c3a2 +Subproject commit dead2cc93039c2641554320d264249e38e5db6c6 diff --git a/rpm/hpg-variant.spec b/rpm/hpg-variant.spec index 473410b..814af55 100644 --- a/rpm/hpg-variant.spec +++ b/rpm/hpg-variant.spec @@ -1,5 +1,5 @@ %define name hpg-variant -%define version 0.2.1 +%define version 0.3 Name: %{name} Version: %{version} Release: 1%{?dist} diff --git a/test/SConscript b/test/SConscript index fab6bc8..a28fdce 100644 --- a/test/SConscript +++ b/test/SConscript @@ -7,7 +7,7 @@ check_fam = penv.Program('checks_family.test', source = ['test_checks_family.c', Glob('#src/*.o'), Glob('#src/gwas/assoc/*.o'), Glob('#src/gwas/tdt/*.o'), "%s/libcommon.a" % commons_path, - "%s/bioformats/libbioformats.a" % bioinfo_path, + "%s/libbioinfo.a" % bioinfo_path, "%s/libhpgmath.a" % math_path ] ) @@ -16,7 +16,7 @@ effect = penv.Program('effect.test', source = ['test_effect_runner.c', Glob('#src/*.o'), '#src/effect/auxiliary_files_writer.o', '#src/effect/effect_options_parsing.o', '#src/effect/effect_runner.o', "%s/libcommon.a" % commons_path, - "%s/bioformats/libbioformats.a" % bioinfo_path + "%s/libbioinfo.a" % bioinfo_path ] ) @@ -25,7 +25,7 @@ epi_data = penv.Program('epistasis_dataset.test', # Glob('#src/*.o'), '#src/epistasis/dataset.o', '#src/epistasis/dataset_creator.o', Glob('#src/*.o'), '#src/epistasis/dataset.o', "%s/libcommon.a" % commons_path, - "%s/bioformats/libbioformats.a" % bioinfo_path + "%s/libbioinfo.a" % bioinfo_path ] ) @@ -33,7 +33,7 @@ merge = penv.Program('merge.test', source = ['test_merge.c', Glob('#src/*.o'), Glob('#src/vcf-tools/merge/*.o'), "%s/libcommon.a" % commons_path, - "%s/bioformats/libbioformats.a" % bioinfo_path, + "%s/libbioinfo.a" % bioinfo_path, "%s/libhpgmath.a" % math_path ] ) @@ -42,7 +42,7 @@ tdt = penv.Program('tdt.test', source = ['test_tdt_runner.c', Glob('#src/*.o'), Glob('#src/gwas/tdt/*.o'), "%s/libcommon.a" % commons_path, - "%s/bioformats/libbioformats.a" % bioinfo_path, + "%s/libbioinfo.a" % bioinfo_path, "%s/libhpgmath.a" % math_path ] )