Author: molinaro
Date: Tue Sep 7 03:35:30 2010
New Revision: 993207
URL: http://svn.apache.org/viewvc?rev=993207&view=rev
Log:
THRIFT-698 - fix .app file, remove unused parts of build system, updated
LICENSE to reflect changes
Added:
incubator/thrift/trunk/lib/erl/src/Makefile.am
Removed:
incubator/thrift/trunk/lib/erl/build/
incubator/thrift/trunk/lib/erl/src/Makefile
incubator/thrift/trunk/lib/erl/src/thrift.appup.src
incubator/thrift/trunk/lib/erl/vsn.mk
Modified:
incubator/thrift/trunk/LICENSE
incubator/thrift/trunk/configure.ac
incubator/thrift/trunk/lib/erl/src/ (props changed)
incubator/thrift/trunk/lib/erl/src/thrift.app.src
Modified: incubator/thrift/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/LICENSE?rev=993207&r1=993206&r2=993207&view=diff
==============================================================================
--- incubator/thrift/trunk/LICENSE (original)
+++ incubator/thrift/trunk/LICENSE Tue Sep 7 03:35:30 2010
@@ -210,16 +210,9 @@ code for the these subcomponents is subj
conditions of the following licenses.
--------------------------------------------------
-The following files are licensed under the MIT License:
- lib/erl/build/beamver
- lib/erl/build/buildtargets.mk
- lib/erl/build/colors.mk
- lib/erl/build/docs.mk
- lib/erl/build/mime.types
- lib/erl/build/otp.mk
- lib/erl/build/otp_subdir.mk
- lib/erl/build/raw_test.mk
- lib/erl/src/Makefile
+Portions of the following files are licensed under the MIT License:
+
+ lib/erl/src/Makefile.am
Please see doc/otp-base-license.txt for the full terms of this license.
Modified: incubator/thrift/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=993207&r1=993206&r2=993207&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Tue Sep 7 03:35:30 2010
@@ -332,6 +332,7 @@ AC_CONFIG_FILES([
lib/cpp/thrift-z.pc
lib/csharp/Makefile
lib/erl/Makefile
+ lib/erl/src/Makefile
lib/java/Makefile
lib/perl/Makefile
lib/perl/test/Makefile
Propchange: incubator/thrift/trunk/lib/erl/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep 7 03:35:30 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
Added: incubator/thrift/trunk/lib/erl/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/Makefile.am?rev=993207&view=auto
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/Makefile.am (added)
+++ incubator/thrift/trunk/lib/erl/src/Makefile.am Tue Sep 7 03:35:30 2010
@@ -0,0 +1,83 @@
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+
+APP_NAME=$(PACKAGE_NAME)
+VSN=$(PACKAGE_VERSION)
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+
+ERL_FLAGS =
+ERL_INCLUDE = -I../include
+ERL_BEHAV_PATH = -pz ../ebin
+ERL_COMPILE_FLAGS = $(ERL_INCLUDE) $(ERL_BEHAV_PATH)
+
+EBIN ?= ../ebin
+ESRC ?= .
+EMULATOR = beam
+
+ERLC_WFLAGS = -W
+ERLC = erlc $(ERLC_WFLAGS) $(ERLC_FLAGS)
+ERL = erl -boot start_clean
+
+$(EBIN)/%.beam: $(ESRC)/%.erl
+ @echo " ERLC $<"
+ @$(ERLC) $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+
+.erl.beam:
+ $(ERLC) $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(dir $@) $<
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES = $(shell find . -name \*.erl | sed 's:^\./::' | sed 's/\.erl//')
+MODULES_STRING_LIST = $(shell find . -name \*.erl | sed 's:^\./::' | sed
's/\.erl/,/')
+BEHAV_MODULES = $(shell find . -name \*.erl | xargs grep -l behaviour_info |
sed 's:^\./::' | sed 's/\.erl//')
+
+ERL_FILES= $(MODULES:%=%.erl)
+DOC_FILES=$(ERL_FILES)
+
+APP_FILE= $(APP_NAME).app
+APP_SRC= $(APP_FILE).src
+APP_TARGET= $(EBIN)/$(APP_FILE)
+
+BEAMS= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+BEHAV_BEAMS= $(BEHAV_MODULES:%=$(EBIN)/%.$(EMULATOR))
+TARGET_FILES= $(BEHAV_BEAMS) $(BEAMS) $(APP_TARGET) $(APPUP_TARGET)
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+all debug opt: $(EBIN) $(TARGET_FILES)
+
+# Note: In the open-source build clean must not destroy the preloaded
+# beam files.
+clean:
+ rm -f $(TARGET_FILES)
+ rm -f *~
+ rm -f core
+ rm -rf $(EBIN)
+ rm -rf *html
+
+$(EBIN):
+ mkdir $(EBIN)
+
+dialyzer: $(TARGET_FILES)
+ dialyzer --src -r . $(ERL_INCLUDE)
+
+# ----------------------------------------------------
+# Special Build Targets
+# ----------------------------------------------------
+
+$(APP_TARGET): $(APP_SRC) $(BEAMS)
+ sed -e 's;%VSN%;$(VSN);' \
+ -e 's;%APP_NAME%;$(APP_NAME);' \
+ -e 's;%MODULES%;%MODULES%$(MODULES_STRING_LIST);' \
+ $< > $<".tmp"
+ sed -e 's/%MODULES%\(.*\),/\1/' \
+ $<".tmp" > $@
+ rm $<".tmp"
Modified: incubator/thrift/trunk/lib/erl/src/thrift.app.src
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift.app.src?rev=993207&r1=993206&r2=993207&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift.app.src (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift.app.src Tue Sep 7 03:35:30 2010
@@ -54,9 +54,6 @@
% should the TApplicationException serialized back to the client
% include the erlang backtrace?
{exceptions_include_traces, true}
- ]},
-
- % The Module and Args used to start this application.
- {mod, {thrift_app, []}}
+ ]}
]
}.
