added V0.9 Beta version code and support for future versioning via version.txt

git-svn-id: https://svn.code.sf.net/p/freetel/code@1123 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/fdmdv2/src/Makefile.linux b/fdmdv2/src/Makefile.linux
index f04e1748455449e52361d0f4490288a9b093723f..2ea7f1436b1a9b8e995dd794c3415ffaa0f11aa7 100644 (file)
--- a/fdmdv2/src/Makefile.linux
+++ b/fdmdv2/src/Makefile.linux
@@ -13,11 +13,12 @@ WX_CONFIG=$(WX_GTK_PATH)/wx-config
 WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags)
 WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui, adv, net)
 SVN_REVISION=$(shell svnversion)
+FREEDV_VERSION=$(shell cat ../version.txt)
 CODEC2_INC=-I$(CODEC2_PATH)/src
 CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a
 SOX_LIB=$(SOX_LIB_PATH)/libsox.a
 
-CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I. -g -Wall -O3 -DSVN_REVISION=\"$(SVN_REVISION)\"
+CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I. -g -Wall -O3 -DSVN_REVISION=\"$(SVN_REVISION)\" -DFREEDV_VERSION="\"$(FREEDV_VERSION)"\"
 LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lpthread -lsndfile /usr/lib/libsamplerate.so.0 -lctb-0.16 $(SOX_LIB)
 
 OBJS = topFrame.o \

diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32
index 4b7b6df2104e9eb42aa5d0ca53b54dee8b6dbf89..83fbfd277f333b2198d6ae4fb1507ed744856e48 100644 (file)
--- a/fdmdv2/src/Makefile.win32
+++ b/fdmdv2/src/Makefile.win32
@@ -12,10 +12,11 @@ WX_CONFIG=wx-config
 WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags) -D__WXDEBUG__
 WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui, adv, net)
 SVN_REVISION=$(shell svnversion)
+FREEDV_VERSION=$(shell cat ../version.txt)
 CODEC2_INC=$(CODEC2_PATH)/src 
 CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a
 
-CPP_FLAGS = -I$(INCLUDE_PATH) $(WX_CPPFLAGS) -I$(CODEC2_INC) -I../extern/include -g -Wall -DSVN_REVISION=\"$(SVN_REVISION)\"
+CPP_FLAGS = -I$(INCLUDE_PATH) $(WX_CPPFLAGS) -I$(CODEC2_INC) -I../extern/include -g -Wall -DSVN_REVISION=\"$(SVN_REVISION)\" -DFREEDV_VERSION="\"$(FREEDV_VERSION)"\"
 LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lportaudio -lpthread -lsndfile -lsamplerate -lctb-0.16 -lsox
 
 OBJS = topFrame.o \

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 4f6b6d909ca9ae68f2cd77539a190deba9bcee60..aa27ae6cf005805f569dff95a8c3bce82b488392 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -207,7 +207,7 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent)
     int h = pConfig->Read(wxT("/MainFrame/height"),    400);
 
     // note: run DebugView program to see this message under windows
-    wxLogDebug("x = %d y = %d w = %d h = %d\n", x,y,w,h);
+    //wxLogDebug("x = %d y = %d w = %d h = %d\n", x,y,w,h);
 
     wxGetApp().m_show_wf            = pConfig->Read(wxT("/MainFrame/show_wf"),      1);
     wxGetApp().m_show_spect         = pConfig->Read(wxT("/MainFrame/show_spect"),   1);
@@ -453,7 +453,7 @@ MainFrame::~MainFrame()
     {
         GetClientSize(&w, &h);
         GetPosition(&x, &y);
-        wxLogDebug("x = %d y = %d w = %d h = %d\n", x,y,w,h);
+        //wxLogDebug("x = %d y = %d w = %d h = %d\n", x,y,w,h);
         pConfig->Write(wxT("/MainFrame/top"),               (long) x);
         pConfig->Write(wxT("/MainFrame/left"),              (long) y);
         pConfig->Write(wxT("/MainFrame/width"),             (long) w);
@@ -1510,11 +1510,12 @@ void MainFrame::OnHelpAbout(wxCommandEvent& event)
     }
 
     wxString msg;
-    msg.Printf( wxT("FreeDV: Open Source Narrow Band Digital Voice over Radio\n\n")
+    msg.Printf( wxT("FreeDV %s\n\n")
+                wxT("Open Source Narrow Band Digital Voice over Radio\n\n")
                 wxT("For Help and Support visit: http://freedv.org\n\n")
                 wxT("GNU Public License V2.1\n\n")
                 wxT("Copyright (c) David Witten KD0EAG and David Rowe VK5DGR\n\n")
-                wxT("svn revision: %s\n") + svnLatestRev, SVN_REVISION);
+                wxT("svn revision: %s\n") + svnLatestRev, FREEDV_VERSION, SVN_REVISION);
 
     wxMessageBox(msg, wxT("About"), wxOK | wxICON_INFORMATION, this);
 

diff --git a/fdmdv2/src/topFrame.h b/fdmdv2/src/topFrame.h
index 7a1c16cd5db9c3c2475f69d925de31943aeaa90c..2df715f6e33f992f055b24434bd67eec83637a7f 100644 (file)
--- a/fdmdv2/src/topFrame.h
+++ b/fdmdv2/src/topFrame.h
@@ -158,7 +158,7 @@ class TopFrame : public wxFrame
 
         wxAuiNotebook* m_auiNbookCtrl;
 
-        TopFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FreeDV svn " SVN_REVISION), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 761,500 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
+        TopFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FreeDV " FREEDV_VERSION), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 761,500 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 
         ~TopFrame();
 

diff --git a/fdmdv2/version.txt b/fdmdv2/version.txt
new file mode 100644 (file)
index 0000000..812cc85
--- /dev/null
+++ b/fdmdv2/version.txt
@@ -0,0 +1 @@
+0.9 Beta