Author: bryanduxbury
Date: Mon May 3 21:33:00 2010
New Revision: 940630
URL: http://svn.apache.org/viewvc?rev=940630&view=rev
Log:
THRIFT-770. build: Get 'make dist' to work without first compiling source code
This patch ditches the old print_version.sh method and instead generates the
compiler's version.h via the Makefile.
Patch: Anthony Molinaro
Added:
incubator/thrift/trunk/compiler/cpp/version.h.in
Removed:
incubator/thrift/trunk/print_version.sh
Modified:
incubator/thrift/trunk/Makefile.am
incubator/thrift/trunk/compiler/cpp/Makefile.am
incubator/thrift/trunk/compiler/cpp/src/main.cc
incubator/thrift/trunk/configure.ac
incubator/thrift/trunk/lib/erl/ (props changed)
incubator/thrift/trunk/lib/php/ (props changed)
incubator/thrift/trunk/test/Makefile.am
Modified: incubator/thrift/trunk/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/Makefile.am?rev=940630&r1=940629&r2=940630&view=diff
==============================================================================
--- incubator/thrift/trunk/Makefile.am (original)
+++ incubator/thrift/trunk/Makefile.am Mon May 3 21:33:00 2010
@@ -24,5 +24,5 @@ SUBDIRS = compiler/cpp lib test
dist-hook:
find $(distdir) -name '.[a-zA-Z0-9]*' | xargs rm -rf
-EXTRA_DIST = bootstrap.sh cleanup.sh print_version.sh doc tutorial contrib \
+EXTRA_DIST = bootstrap.sh cleanup.sh doc tutorial contrib \
CONTRIBUTORS LICENSE CHANGES DISCLAIMER NOTICE
Modified: incubator/thrift/trunk/compiler/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/Makefile.am?rev=940630&r1=940629&r2=940630&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/Makefile.am (original)
+++ incubator/thrift/trunk/compiler/cpp/Makefile.am Mon May 3 21:33:00 2010
@@ -118,29 +118,3 @@ clean-local:
$(RM) thriftl.cc thrifty.cc thrifty.h version.h
src/main.cc: version.h
-
-# Adding this to BUILT_SOURCES will cause version.h to be
-# regenerated on every "make all" or "make check", which is
-# necessary because it changes whenever we "svn up" or similar.
-# Ideally, we would like this to be regenerated whenever the
-# compiler is rebuilt, but every way we could think of to do
-# that caused unnecessary rebuilds of the compiler.
-BUILT_SOURCES += regen_version_h
-
-THRIFT_VERSION=$(shell /bin/sh $(top_srcdir)/print_version.sh -v)
-THRIFT_REVISION=$(shell /bin/sh $(top_srcdir)/print_version.sh -r)
-
-regen_version_h:
- @printf "Regenerating version.h... "
- @TMPFILE=`mktemp ./version_h.tmp_XXXXXX` ; \
- echo "// AUTOGENERATED, DO NOT EDIT" > $$TMPFILE ; \
- echo '#define THRIFT_VERSION "$(THRIFT_VERSION)"' >> $$TMPFILE
; \
- echo '#define THRIFT_REVISION "$(THRIFT_REVISION)"' >>
$$TMPFILE ; \
- if cmp $$TMPFILE version.h >/dev/null ; \
- then \
- rm -f $$TMPFILE ; \
- echo "No changes." ; \
- else \
- mv $$TMPFILE version.h ; \
- echo "Updated." ; \
- fi
Modified: incubator/thrift/trunk/compiler/cpp/src/main.cc
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/main.cc?rev=940630&r1=940629&r2=940630&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/main.cc (original)
+++ incubator/thrift/trunk/compiler/cpp/src/main.cc Mon May 3 21:33:00 2010
@@ -618,7 +618,7 @@ void generate_all_fingerprints(t_program
* Prints the version number
*/
void version() {
- printf("Thrift version %s-%s\n", THRIFT_VERSION, THRIFT_REVISION);
+ printf("Thrift version %s\n", THRIFT_VERSION);
}
/**
Added: incubator/thrift/trunk/compiler/cpp/version.h.in
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/version.h.in?rev=940630&view=auto
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/version.h.in (added)
+++ incubator/thrift/trunk/compiler/cpp/version.h.in Mon May 3 21:33:00 2010
@@ -0,0 +1 @@
+#define THRIFT_VERSION "@PACKAGE_VERSION@"
Modified: incubator/thrift/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=940630&r1=940629&r2=940630&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Mon May 3 21:33:00 2010
@@ -253,6 +253,7 @@ AC_CONFIG_HEADERS(config.h:config.hin)
AC_CONFIG_FILES([
Makefile
compiler/cpp/Makefile
+ compiler/cpp/version.h
lib/Makefile
lib/cpp/Makefile
lib/cpp/thrift.pc
Propchange: incubator/thrift/trunk/lib/erl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 3 21:33:00 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
Propchange: incubator/thrift/trunk/lib/php/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 3 21:33:00 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
Modified: incubator/thrift/trunk/test/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/Makefile.am?rev=940630&r1=940629&r2=940630&view=diff
==============================================================================
--- incubator/thrift/trunk/test/Makefile.am (original)
+++ incubator/thrift/trunk/test/Makefile.am Mon May 3 21:33:00 2010
@@ -28,7 +28,7 @@ SUBDIRS += rb
endif
noinst_LTLIBRARIES = libtestgencpp.la
-libtestgencpp_la_SOURCES = \
+nodist_libtestgencpp_la_SOURCES = \
gen-cpp/DebugProtoTest_types.cpp \
gen-cpp/OptionalRequiredTest_types.cpp \
gen-cpp/DebugProtoTest_types.cpp \
@@ -175,4 +175,7 @@ EXTRA_DIST = \
ThriftTest.thrift \
ZlibTest.cpp \
DenseProtoTest.cpp \
- FastbinaryTest.py
+ FastbinaryTest.py \
+ ThriftTest_extras.cpp \
+ DebugProtoTest_extras.cpp
+
