You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2012/10/24 20:40:07 UTC
svn commit: r1401818 - in /thrift/trunk: configure.ac tutorial/Makefile.am
tutorial/cpp/ tutorial/cpp/Makefile tutorial/cpp/Makefile.am
tutorial/java/Makefile.am tutorial/java/build.xml tutorial/js/Makefile.am
tutorial/js/build.xml
Author: roger
Date: Wed Oct 24 18:40:06 2012
New Revision: 1401818
URL: http://svn.apache.org/viewvc?rev=1401818&view=rev
Log:
THRIFT-1735 integrate tutorial into regular build
- cpp support
- cleanup stuff
Added:
thrift/trunk/tutorial/cpp/Makefile.am (with props)
Removed:
thrift/trunk/tutorial/cpp/Makefile
Modified:
thrift/trunk/configure.ac
thrift/trunk/tutorial/Makefile.am
thrift/trunk/tutorial/cpp/ (props changed)
thrift/trunk/tutorial/java/Makefile.am
thrift/trunk/tutorial/java/build.xml
thrift/trunk/tutorial/js/Makefile.am
thrift/trunk/tutorial/js/build.xml
Modified: thrift/trunk/configure.ac
URL: http://svn.apache.org/viewvc/thrift/trunk/configure.ac?rev=1401818&r1=1401817&r2=1401818&view=diff
==============================================================================
--- thrift/trunk/configure.ac (original)
+++ thrift/trunk/configure.ac Wed Oct 24 18:40:06 2012
@@ -612,6 +612,7 @@ AC_CONFIG_FILES([
test/py.twisted/Makefile
test/rb/Makefile
tutorial/Makefile
+ tutorial/cpp/Makefile
tutorial/java/Makefile
tutorial/js/Makefile
])
Modified: thrift/trunk/tutorial/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/tutorial/Makefile.am?rev=1401818&r1=1401817&r2=1401818&view=diff
==============================================================================
--- thrift/trunk/tutorial/Makefile.am (original)
+++ thrift/trunk/tutorial/Makefile.am Wed Oct 24 18:40:06 2012
@@ -20,7 +20,7 @@
SUBDIRS =
if WITH_CPP
-#SUBDIRS += cpp
+SUBDIRS += cpp
endif
if WITH_JAVA
@@ -52,5 +52,5 @@ endif
#
# generate html for ThriftTest.thrift
#
-check-local:
+all-local:
$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/tutorial/tutorial.thrift
Propchange: thrift/trunk/tutorial/cpp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Oct 24 18:40:06 2012
@@ -1,2 +1,5 @@
-CppClient
-CppServer
+Makefile.in
+gen-cpp
+TutorialServer
+TutorialClient
+.deps
Added: thrift/trunk/tutorial/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/tutorial/cpp/Makefile.am?rev=1401818&view=auto
==============================================================================
--- thrift/trunk/tutorial/cpp/Makefile.am (added)
+++ thrift/trunk/tutorial/cpp/Makefile.am Wed Oct 24 18:40:06 2012
@@ -0,0 +1,82 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+noinst_LTLIBRARIES = libtutorialgencpp.la
+nodist_libtutorialgencpp_la_SOURCES = \
+ gen-cpp/Calculator.cpp \
+ gen-cpp/Calculator.h \
+ gen-cpp/SharedService.cpp \
+ gen-cpp/SharedService.h \
+ gen-cpp/shared_constants.cpp \
+ gen-cpp/shared_constants.h \
+ gen-cpp/shared_types.cpp \
+ gen-cpp/shared_types.h \
+ gen-cpp/tutorial_constants.cpp \
+ gen-cpp/tutorial_constants.h \
+ gen-cpp/tutorial_types.cpp \
+ gen-cpp/tutorial_types.h
+
+
+
+libtutorialgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
+
+noinst_PROGRAMS = \
+ TutorialServer \
+ TutorialClient
+
+TutorialServer_SOURCES = \
+ CppServer.cpp
+
+TutorialServer_LDADD = \
+ libtutorialgencpp.la \
+ $(top_builddir)/lib/cpp/libthrift.la
+
+TutorialClient_SOURCES = \
+ CppClient.cpp
+
+TutorialClient_LDADD = \
+ libtutorialgencpp.la \
+ $(top_builddir)/lib/cpp/libthrift.la
+
+#
+# Common thrift code generation rules
+#
+THRIFT = $(top_builddir)/compiler/cpp/thrift
+
+gen-cpp/Calculator.cpp gen-cpp/tutorial_types.cpp gen-cpp/tutorial_constants.cpp: $(top_srcdir)/tutorial/tutorial.thrift
+ $(THRIFT) --gen cpp -r $<
+
+INCLUDES = \
+ -I$(top_srcdir)/lib/cpp/src -Igen-cpp
+
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
+AM_CXXFLAGS = -Wall
+AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
+
+clean-local:
+ $(RM) -r gen-cpp
+
+tutorialserver: all
+ ./TutorialServer
+
+tutorialclient: all
+ ./TutorialClient
+
+EXTRA_DIST = \
+ CppClient.cpp \
+ CppServer.cpp
Propchange: thrift/trunk/tutorial/cpp/Makefile.am
------------------------------------------------------------------------------
svn:executable = *
Modified: thrift/trunk/tutorial/java/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/tutorial/java/Makefile.am?rev=1401818&r1=1401817&r2=1401818&view=diff
==============================================================================
--- thrift/trunk/tutorial/java/Makefile.am (original)
+++ thrift/trunk/tutorial/java/Makefile.am Wed Oct 24 18:40:06 2012
@@ -24,6 +24,9 @@ clean-local:
ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
$$ANT $(ANT_FLAGS) clean
+all-local:
+ $(ANT) $(ANT_FLAGS) compile
+
check-local: all
$(ANT) $(ANT_FLAGS) test
Modified: thrift/trunk/tutorial/java/build.xml
URL: http://svn.apache.org/viewvc/thrift/trunk/tutorial/java/build.xml?rev=1401818&r1=1401817&r2=1401818&view=diff
==============================================================================
--- thrift/trunk/tutorial/java/build.xml (original)
+++ thrift/trunk/tutorial/java/build.xml Wed Oct 24 18:40:06 2012
@@ -106,6 +106,7 @@
<target name="clean">
<delete dir="${build}" />
+ <delete dir="${gen}"/>
<delete file="tutorial.jar" />
</target>
Modified: thrift/trunk/tutorial/js/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/tutorial/js/Makefile.am?rev=1401818&r1=1401817&r2=1401818&view=diff
==============================================================================
--- thrift/trunk/tutorial/js/Makefile.am (original)
+++ thrift/trunk/tutorial/js/Makefile.am Wed Oct 24 18:40:06 2012
@@ -24,6 +24,9 @@ clean-local:
ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
$$ANT $(ANT_FLAGS) clean
+all-local:
+ $(ANT) $(ANT_FLAGS) compile
+
check-local: all
$(ANT) $(ANT_FLAGS) test
Modified: thrift/trunk/tutorial/js/build.xml
URL: http://svn.apache.org/viewvc/thrift/trunk/tutorial/js/build.xml?rev=1401818&r1=1401817&r2=1401818&view=diff
==============================================================================
--- thrift/trunk/tutorial/js/build.xml (original)
+++ thrift/trunk/tutorial/js/build.xml Wed Oct 24 18:40:06 2012
@@ -83,6 +83,7 @@
<target name="clean">
<delete dir="${build}" />
+ <delete dir="gen-js"/>
<delete file="tutorial-js.jar" />
</target>