Author: dreiss
Date: Tue Jun 10 18:14:38 2008
New Revision: 666480
URL: http://svn.apache.org/viewvc?rev=666480&view=rev
Log:
Remove all of the old Erlang stuff in preparation for renaming alterl.
Removed:
incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc
incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.h
incubator/thrift/trunk/lib/erl/COPYING
incubator/thrift/trunk/lib/erl/LICENSE
incubator/thrift/trunk/lib/erl/Makefile
incubator/thrift/trunk/lib/erl/README
incubator/thrift/trunk/lib/erl/TODO
incubator/thrift/trunk/lib/erl/build/beamver
incubator/thrift/trunk/lib/erl/build/buildtargets.mk
incubator/thrift/trunk/lib/erl/build/colors.mk
incubator/thrift/trunk/lib/erl/build/docs.mk
incubator/thrift/trunk/lib/erl/build/mime.types
incubator/thrift/trunk/lib/erl/build/otp.mk
incubator/thrift/trunk/lib/erl/build/otp_subdir.mk
incubator/thrift/trunk/lib/erl/build/raw_test.mk
incubator/thrift/trunk/lib/erl/include/oop.hrl
incubator/thrift/trunk/lib/erl/include/protocol/tBinaryProtocol.hrl
incubator/thrift/trunk/lib/erl/include/protocol/tBinaryProtocolFactory.hrl
incubator/thrift/trunk/lib/erl/include/protocol/tProtocol.hrl
incubator/thrift/trunk/lib/erl/include/protocol/tProtocolException.hrl
incubator/thrift/trunk/lib/erl/include/protocol/tProtocolFactory.hrl
incubator/thrift/trunk/lib/erl/include/server/tErlServer.hrl
incubator/thrift/trunk/lib/erl/include/server/tServer.hrl
incubator/thrift/trunk/lib/erl/include/server/tSimpleServer.hrl
incubator/thrift/trunk/lib/erl/include/tApplicationException.hrl
incubator/thrift/trunk/lib/erl/include/tErlProcessor.hrl
incubator/thrift/trunk/lib/erl/include/tException.hrl
incubator/thrift/trunk/lib/erl/include/tProcessor.hrl
incubator/thrift/trunk/lib/erl/include/thrift.hrl
incubator/thrift/trunk/lib/erl/include/thrift_constants.hrl
incubator/thrift/trunk/lib/erl/include/thrift_macros.hrl
incubator/thrift/trunk/lib/erl/include/transport/tBufferedTransport.hrl
incubator/thrift/trunk/lib/erl/include/transport/tBufferedTransportFactory.hrl
incubator/thrift/trunk/lib/erl/include/transport/tErlAcceptor.hrl
incubator/thrift/trunk/lib/erl/include/transport/tServerSocket.hrl
incubator/thrift/trunk/lib/erl/include/transport/tServerTransport.hrl
incubator/thrift/trunk/lib/erl/include/transport/tSocket.hrl
incubator/thrift/trunk/lib/erl/include/transport/tTransport.hrl
incubator/thrift/trunk/lib/erl/include/transport/tTransportException.hrl
incubator/thrift/trunk/lib/erl/include/transport/tTransportFactory.hrl
incubator/thrift/trunk/lib/erl/src/Makefile
incubator/thrift/trunk/lib/erl/src/oop.erl
incubator/thrift/trunk/lib/erl/src/protocol/tBinaryProtocol.erl
incubator/thrift/trunk/lib/erl/src/protocol/tBinaryProtocolFactory.erl
incubator/thrift/trunk/lib/erl/src/protocol/tProtocol.erl
incubator/thrift/trunk/lib/erl/src/protocol/tProtocolException.erl
incubator/thrift/trunk/lib/erl/src/protocol/tProtocolFactory.erl
incubator/thrift/trunk/lib/erl/src/server/tErlServer.erl
incubator/thrift/trunk/lib/erl/src/server/tServer.erl
incubator/thrift/trunk/lib/erl/src/server/tSimpleServer.erl
incubator/thrift/trunk/lib/erl/src/tApplicationException.erl
incubator/thrift/trunk/lib/erl/src/tErlProcessor.erl
incubator/thrift/trunk/lib/erl/src/tException.erl
incubator/thrift/trunk/lib/erl/src/tProcessor.erl
incubator/thrift/trunk/lib/erl/src/thrift.app.src
incubator/thrift/trunk/lib/erl/src/thrift.appup.src
incubator/thrift/trunk/lib/erl/src/thrift.erl
incubator/thrift/trunk/lib/erl/src/thrift_app.erl
incubator/thrift/trunk/lib/erl/src/thrift_app_sup.erl
incubator/thrift/trunk/lib/erl/src/thrift_logger.erl
incubator/thrift/trunk/lib/erl/src/thrift_oop_server.erl
incubator/thrift/trunk/lib/erl/src/thrift_sup.erl
incubator/thrift/trunk/lib/erl/src/thrift_utils.erl
incubator/thrift/trunk/lib/erl/src/transport/tBufferedTransport.erl
incubator/thrift/trunk/lib/erl/src/transport/tBufferedTransportFactory.erl
incubator/thrift/trunk/lib/erl/src/transport/tErlAcceptor.erl
incubator/thrift/trunk/lib/erl/src/transport/tServerSocket.erl
incubator/thrift/trunk/lib/erl/src/transport/tServerTransport.erl
incubator/thrift/trunk/lib/erl/src/transport/tSocket.erl
incubator/thrift/trunk/lib/erl/src/transport/tTransport.erl
incubator/thrift/trunk/lib/erl/src/transport/tTransportException.erl
incubator/thrift/trunk/lib/erl/src/transport/tTransportFactory.erl
incubator/thrift/trunk/lib/erl/vsn.mk
incubator/thrift/trunk/tutorial/erl/client.erl
incubator/thrift/trunk/tutorial/erl/client.sh
incubator/thrift/trunk/tutorial/erl/server.config
incubator/thrift/trunk/tutorial/erl/server.erl
incubator/thrift/trunk/tutorial/erl/server.sh
Modified:
incubator/thrift/trunk/compiler/cpp/Makefile.am
incubator/thrift/trunk/compiler/cpp/src/main.cc
incubator/thrift/trunk/lib/Makefile.am
Modified: incubator/thrift/trunk/compiler/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/Makefile.am?rev=666480&r1=666479&r2=666480&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/Makefile.am (original)
+++ incubator/thrift/trunk/compiler/cpp/Makefile.am Tue Jun 10 18:14:38 2008
@@ -11,7 +11,6 @@
src/generate/t_generator.cc \
src/generate/t_php_generator.cc \
src/generate/t_xsd_generator.cc \
- src/generate/t_erl_generator.cc \
src/generate/t_alterl_generator.cc \
src/globals.h \
src/main.h \
@@ -39,7 +38,6 @@
src/generate/t_oop_generator.h \
src/generate/t_php_generator.h \
src/generate/t_xsd_generator.h \
- src/generate/t_erl_generator.h \
src/generate/t_alterl_generator.h
if THRIFT_GEN_cpp
Modified: incubator/thrift/trunk/compiler/cpp/src/main.cc
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/main.cc?rev=666480&r1=666479&r2=666480&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/main.cc (original)
+++ incubator/thrift/trunk/compiler/cpp/src/main.cc Tue Jun 10 18:14:38 2008
@@ -38,7 +38,6 @@
#include "parse/t_scope.h"
#include "generate/t_php_generator.h"
#include "generate/t_xsd_generator.h"
-#include "generate/t_erl_generator.h"
#include "generate/t_alterl_generator.h"
using namespace std;
@@ -152,7 +151,6 @@
bool gen_phpo = false;
bool gen_rest = false;
bool gen_perl = false;
-bool gen_erl = false;
bool gen_alterl = false;
bool gen_ocaml = false;
bool gen_hs = false;
@@ -603,7 +601,6 @@
fprintf(stderr, " -phpa Generate PHP with autoload (with -php)\n");
fprintf(stderr, " -phpo Generate PHP with object oriented subclasses
(with -php)\n");
fprintf(stderr, " -xsd Generate XSD output files\n");
- fprintf(stderr, " -erl Generate Erlang output files\n");
fprintf(stderr, " -alterl Generate Alternative Erlang output files\n");
fprintf(stderr, " -o dir Set the output directory for gen-*
packages\n");
fprintf(stderr, " (default: current directory)\n");
@@ -874,13 +871,6 @@
delete xsd;
}
- if (gen_erl) {
- pverbose("Generating Erlang\n");
- t_erl_generator* erl = new t_erl_generator(program);
- erl->generate_program();
- delete erl;
- }
-
if (gen_alterl) {
pverbose("Generating Alternative Erlang\n");
t_alterl_generator* alterl = new t_alterl_generator(program);
@@ -1002,8 +992,6 @@
gen_xsd = true;
} else if (strcmp(arg, "-perl") == 0) {
gen_perl = true;
- } else if (strcmp(arg, "-erl") == 0) {
- gen_erl = true;
} else if (strcmp(arg, "-alterl") == 0) {
gen_alterl = true;
} else if (strcmp(arg, "-ocaml") == 0) {
@@ -1117,7 +1105,7 @@
}
// You gotta generate something!
- if (!gen_php && !gen_phpi && !gen_xsd && !gen_erl && !gen_alterl &&
generator_strings.empty()) {
+ if (!gen_php && !gen_phpi && !gen_xsd && !gen_alterl &&
generator_strings.empty()) {
fprintf(stderr, "!!! No output language(s) specified\n\n");
usage();
}
Modified: incubator/thrift/trunk/lib/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/Makefile.am?rev=666480&r1=666479&r2=666480&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/Makefile.am (original)
+++ incubator/thrift/trunk/lib/Makefile.am Tue Jun 10 18:14:38 2008
@@ -11,12 +11,11 @@
endif
if ENABLE_ERLANG
-SUBDIRS += erl
+SUBDIRS += alterl
endif
EXTRA_DIST = \
cocoa \
- erl \
hs \
ocaml \
perl \
