summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-02-07 09:18:43 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-02-07 09:18:43 +0100
commitee08497a002fbf0dc1884a9a679c3831215d7699 (patch)
tree0de2f6815a608871b324d7951c15a00cf16c901c
parent45fa35c61f280c9bed0d2cbff11f91609f66baa4 (diff)
downloaddabmod-0.4.0.tar.gz
dabmod-0.4.0.tar.bz2
dabmod-0.4.0.zip
fix versioning and tarball generationv0.4.0
-rw-r--r--ChangeLog7
-rw-r--r--INSTALL4
-rw-r--r--configure.ac2
-rw-r--r--src/DabMod.cpp10
-rw-r--r--src/Makefile.am15
5 files changed, 26 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 1301bb1..1e2b629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
This file contains information about the changes done to
the ODR-DabMod in this repository
+2014-02-07: Matthias P. Braendli <matthias@mpb.li>
+ (v0.4.0)
+ * odr-dabmod:
+ Renamed CRC-DABMOD to ODR-DabMod
+ Fixed version generation
+ Fixed missing files in tarball
+
2014-01-31: Matthias P. Braendli <matthias@mpb.li>
(tag r11)
* crc-dabmod:
diff --git a/INSTALL b/INSTALL
index 8b3d491..f591f02 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,8 +8,8 @@ Required dependencies:
Simple install procedure:
=========================
- % tar xjf crc-dabmod-0.3.2.tar.bz2 # Unpack the source
- % cd crc-dabmod-0.3.2 # Change to the source directory
+ % tar xjf odr-dabmod-X.Y.Z.tar.bz2 # Unpack the source
+ % cd odr-dabmod-X.Y.Z # Change to the source directory
% ./configure --disable-debug --with-debug-malloc=yes --enable-fft-simd
# Run the configure script
% make # Build ODR-DabMod
diff --git a/configure.ac b/configure.ac
index 0ec5831..69bcbd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
# along with ODR-DabMod. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.59)
-AC_INIT([ODR-DabMod], [0.3.3-mpb], [pascal.charest@crc.ca])
+AC_INIT([ODR-DabMod], [0.4.0], [matthias.braendli@mpb.li])
AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([-Wall])
diff --git a/src/DabMod.cpp b/src/DabMod.cpp
index 66665bd..4adce76 100644
--- a/src/DabMod.cpp
+++ b/src/DabMod.cpp
@@ -78,8 +78,14 @@ void signalHandler(int signalNb)
void printUsage(char* progName, FILE* out = stderr)
{
- fprintf(out, "Welcome to %s %s%s, compiled at %s, %s\n\n",
- PACKAGE, VERSION, GITVERSION, __DATE__, __TIME__);
+ fprintf(out, "Welcome to %s %s, compiled at %s, %s\n\n",
+ PACKAGE,
+#if defined(GITVERSION)
+ GITVERSION,
+#else
+ VERSION,
+#endif
+ __DATE__, __TIME__);
fprintf(out, "Usage with configuration file:\n");
fprintf(out, "\t%s -C config_file.ini\n\n", progName);
diff --git a/src/Makefile.am b/src/Makefile.am
index df9a511..9145f47 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,9 +17,9 @@
# along with ODR-DabMod. If not, see <http://www.gnu.org/licenses/>.
if IS_GIT_REPO
-GITVERSION_FLAGS = -DGITVERSION="\"-`git describe --long --tags`\""
+GITVERSION_FLAGS = -DGITVERSION="\"`git describe`\""
else
-GITVERSION_FLAGS = -DGITVERSION="\"-modified\""
+GITVERSION_FLAGS =
endif
if HAVE_INPUT_ZEROMQ_TEST
@@ -35,7 +35,7 @@ FFT_FLG=-ffast-math
.PHONY: kiss_fft129 reed-solomon-4.0
-bin_PROGRAMS = crc-dabmod
+bin_PROGRAMS = odr-dabmod
DabModulator.cpp: $(FFT_DIR)
@@ -46,9 +46,9 @@ $(FFT_DIR):
tar xzf $(top_srcdir)/lib/kiss_fft129.tar.gz -C $(top_builddir)/lib; \
fi
-crc_dabmod_CPPFLAGS = $(FFT_INC) $(FFT_FLG) -msse -msse2 $(GITVERSION_FLAGS)
-crc_dabmod_LDADD = $(ZMQ_LIBS)
-crc_dabmod_SOURCES = DabMod.cpp \
+odr_dabmod_CPPFLAGS = $(FFT_INC) $(FFT_FLG) -msse -msse2 $(GITVERSION_FLAGS)
+odr_dabmod_LDADD = $(ZMQ_LIBS)
+odr_dabmod_SOURCES = DabMod.cpp \
PcDebug.h \
porting.c porting.h \
DabModulator.cpp DabModulator.h \
@@ -89,9 +89,10 @@ crc_dabmod_SOURCES = DabMod.cpp \
Resampler.cpp Resampler.h \
ConvEncoder.cpp ConvEncoder.h \
TimeInterleaver.cpp TimeInterleaver.h \
+ ThreadsafeQueue.h \
Log.cpp Log.h \
RemoteControl.cpp RemoteControl.h
-nodist_crc_dabmod_SOURCES =$(FFT_SRC)
+nodist_odr_dabmod_SOURCES =$(FFT_SRC)
dist_bin_SCRIPTS =crc-dwap.py