From 9f2a5d77997cbfac2f46d267d326fa0e0886a77f Mon Sep 17 00:00:00 2001 From: David Reiss Date: Wed, 11 Jun 2008 01:15:45 +0000 Subject: [PATCH] Rename "alterl" to "erl". git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@666481 13f79535-47bb-0310-9956-ffa450edef68 --- .gitignore | 2 +- compiler/cpp/Makefile.am | 4 +- ...alterl_generator.cc => t_erl_generator.cc} | 66 +++++++++---------- ...t_alterl_generator.h => t_erl_generator.h} | 8 +-- compiler/cpp/src/main.cc | 22 +++---- lib/Makefile.am | 2 +- lib/{alterl => erl}/COPYING | 0 lib/{alterl => erl}/LICENSE | 0 lib/{alterl => erl}/Makefile | 0 lib/{alterl => erl}/README | 0 lib/{alterl => erl}/build/beamver | 0 lib/{alterl => erl}/build/buildtargets.mk | 0 lib/{alterl => erl}/build/colors.mk | 0 lib/{alterl => erl}/build/docs.mk | 0 lib/{alterl => erl}/build/mime.types | 0 lib/{alterl => erl}/build/otp.mk | 0 lib/{alterl => erl}/build/otp_subdir.mk | 0 lib/{alterl => erl}/build/raw_test.mk | 0 .../include/thrift_constants.hrl | 0 .../include/thrift_protocol.hrl | 0 lib/{alterl => erl}/src/Makefile | 0 lib/{alterl => erl}/src/test_handler.erl | 0 lib/{alterl => erl}/src/test_service.erl | 0 lib/{alterl => erl}/src/thrift.app.src | 0 lib/{alterl => erl}/src/thrift.appup.src | 0 .../src/thrift_base64_transport.erl | 0 .../src/thrift_binary_protocol.erl | 0 .../src/thrift_buffered_transport.erl | 0 lib/{alterl => erl}/src/thrift_client.erl | 0 .../src/thrift_disk_log_transport.erl | 0 .../src/thrift_file_transport.erl | 0 .../src/thrift_framed_transport.erl | 0 .../src/thrift_http_transport.erl | 0 lib/{alterl => erl}/src/thrift_processor.erl | 0 lib/{alterl => erl}/src/thrift_protocol.erl | 0 lib/{alterl => erl}/src/thrift_server.erl | 0 lib/{alterl => erl}/src/thrift_service.erl | 0 .../src/thrift_socket_server.erl | 0 .../src/thrift_socket_transport.erl | 0 lib/{alterl => erl}/src/thrift_transport.erl | 0 lib/{alterl => erl}/vsn.mk | 0 test/erl/Makefile | 6 +- tutorial/{alterl => erl}/client.erl | 0 tutorial/{alterl => erl}/client.sh | 0 tutorial/{alterl => erl}/server.erl | 0 tutorial/{alterl => erl}/server.sh | 2 +- 46 files changed, 56 insertions(+), 56 deletions(-) rename compiler/cpp/src/generate/{t_alterl_generator.cc => t_erl_generator.cc} (90%) rename compiler/cpp/src/generate/{t_alterl_generator.h => t_erl_generator.h} (95%) rename lib/{alterl => erl}/COPYING (100%) rename lib/{alterl => erl}/LICENSE (100%) rename lib/{alterl => erl}/Makefile (100%) rename lib/{alterl => erl}/README (100%) rename lib/{alterl => erl}/build/beamver (100%) rename lib/{alterl => erl}/build/buildtargets.mk (100%) rename lib/{alterl => erl}/build/colors.mk (100%) rename lib/{alterl => erl}/build/docs.mk (100%) rename lib/{alterl => erl}/build/mime.types (100%) rename lib/{alterl => erl}/build/otp.mk (100%) rename lib/{alterl => erl}/build/otp_subdir.mk (100%) rename lib/{alterl => erl}/build/raw_test.mk (100%) rename lib/{alterl => erl}/include/thrift_constants.hrl (100%) rename lib/{alterl => erl}/include/thrift_protocol.hrl (100%) rename lib/{alterl => erl}/src/Makefile (100%) rename lib/{alterl => erl}/src/test_handler.erl (100%) rename lib/{alterl => erl}/src/test_service.erl (100%) rename lib/{alterl => erl}/src/thrift.app.src (100%) rename lib/{alterl => erl}/src/thrift.appup.src (100%) rename lib/{alterl => erl}/src/thrift_base64_transport.erl (100%) rename lib/{alterl => erl}/src/thrift_binary_protocol.erl (100%) rename lib/{alterl => erl}/src/thrift_buffered_transport.erl (100%) rename lib/{alterl => erl}/src/thrift_client.erl (100%) rename lib/{alterl => erl}/src/thrift_disk_log_transport.erl (100%) rename lib/{alterl => erl}/src/thrift_file_transport.erl (100%) rename lib/{alterl => erl}/src/thrift_framed_transport.erl (100%) rename lib/{alterl => erl}/src/thrift_http_transport.erl (100%) rename lib/{alterl => erl}/src/thrift_processor.erl (100%) rename lib/{alterl => erl}/src/thrift_protocol.erl (100%) rename lib/{alterl => erl}/src/thrift_server.erl (100%) rename lib/{alterl => erl}/src/thrift_service.erl (100%) rename lib/{alterl => erl}/src/thrift_socket_server.erl (100%) rename lib/{alterl => erl}/src/thrift_socket_transport.erl (100%) rename lib/{alterl => erl}/src/thrift_transport.erl (100%) rename lib/{alterl => erl}/vsn.mk (100%) rename tutorial/{alterl => erl}/client.erl (100%) rename tutorial/{alterl => erl}/client.sh (100%) rename tutorial/{alterl => erl}/server.erl (100%) rename tutorial/{alterl => erl}/server.sh (93%) diff --git a/.gitignore b/.gitignore index ae513f4f..6b5f0e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,7 @@ if/Makefile.in install-sh lib/Makefile lib/Makefile.in -lib/alterl/ebin +lib/erl/ebin lib/cpp/.deps lib/cpp/.libs lib/cpp/Makefile diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am index 81aebd43..d7c70856 100644 --- a/compiler/cpp/Makefile.am +++ b/compiler/cpp/Makefile.am @@ -11,7 +11,7 @@ thrift_SOURCES = src/thrifty.yy \ src/generate/t_generator.cc \ src/generate/t_php_generator.cc \ src/generate/t_xsd_generator.cc \ - src/generate/t_alterl_generator.cc \ + src/generate/t_erl_generator.cc \ src/globals.h \ src/main.h \ src/platform.h \ @@ -38,7 +38,7 @@ thrift_SOURCES = src/thrifty.yy \ src/generate/t_oop_generator.h \ src/generate/t_php_generator.h \ src/generate/t_xsd_generator.h \ - src/generate/t_alterl_generator.h + src/generate/t_erl_generator.h if THRIFT_GEN_cpp thrift_SOURCES += src/generate/t_cpp_generator.cc diff --git a/compiler/cpp/src/generate/t_alterl_generator.cc b/compiler/cpp/src/generate/t_erl_generator.cc similarity index 90% rename from compiler/cpp/src/generate/t_alterl_generator.cc rename to compiler/cpp/src/generate/t_erl_generator.cc index 5fe8034a..b6c8c52d 100644 --- a/compiler/cpp/src/generate/t_alterl_generator.cc +++ b/compiler/cpp/src/generate/t_erl_generator.cc @@ -8,7 +8,7 @@ #include #include #include -#include "t_alterl_generator.h" +#include "t_erl_generator.h" using namespace std; @@ -18,7 +18,7 @@ using namespace std; * * @param tprogram The program to generate */ -void t_alterl_generator::init_generator() { +void t_erl_generator::init_generator() { // Make output directory mkdir(get_out_dir().c_str(), S_IRWXU | S_IRWXG | S_IRWXO); @@ -60,19 +60,19 @@ void t_alterl_generator::init_generator() { /** * Boilerplate at beginning and end of header files */ -void t_alterl_generator::hrl_header(ostream& out, string name) { +void t_erl_generator::hrl_header(ostream& out, string name) { out << "-ifndef(_" << name << "_included)." << endl << "-define(_" << name << "_included, yeah)." << endl; } -void t_alterl_generator::hrl_footer(ostream& out, string name) { +void t_erl_generator::hrl_footer(ostream& out, string name) { out << "-endif." << endl; } /** * Renders all the imports necessary for including another Thrift program */ -string t_alterl_generator::render_includes() { +string t_erl_generator::render_includes() { const vector& includes = program_->get_includes(); string result = ""; for (size_t i = 0; i < includes.size(); ++i) { @@ -87,7 +87,7 @@ string t_alterl_generator::render_includes() { /** * Autogen'd comment */ -string t_alterl_generator::erl_autogen_comment() { +string t_erl_generator::erl_autogen_comment() { return std::string("%%\n") + "%% Autogenerated by Thrift\n" + @@ -99,14 +99,14 @@ string t_alterl_generator::erl_autogen_comment() { /** * Prints standard thrift imports */ -string t_alterl_generator::erl_imports() { +string t_erl_generator::erl_imports() { return ""; } /** * Closes the type files */ -void t_alterl_generator::close_generator() { +void t_erl_generator::close_generator() { // Close types file export_types_string("struct_info", 1); @@ -126,7 +126,7 @@ void t_alterl_generator::close_generator() { * * @param ttypedef The type definition */ -void t_alterl_generator::generate_typedef(t_typedef* ttypedef) { +void t_erl_generator::generate_typedef(t_typedef* ttypedef) { } /** @@ -135,7 +135,7 @@ void t_alterl_generator::generate_typedef(t_typedef* ttypedef) { * * @param tenum The enumeration */ -void t_alterl_generator::generate_enum(t_enum* tenum) { +void t_erl_generator::generate_enum(t_enum* tenum) { vector constants = tenum->get_constants(); vector::iterator c_iter; @@ -160,7 +160,7 @@ void t_alterl_generator::generate_enum(t_enum* tenum) { /** * Generate a constant value */ -void t_alterl_generator::generate_const(t_const* tconst) { +void t_erl_generator::generate_const(t_const* tconst) { t_type* type = tconst->get_type(); string name = capitalize(tconst->get_name()); t_const_value* value = tconst->get_value(); @@ -173,7 +173,7 @@ void t_alterl_generator::generate_const(t_const* tconst) { * is NOT performed in this function as it is always run beforehand using the * validate_types method in main.cc */ -string t_alterl_generator::render_const_value(t_type* type, t_const_value* value) { +string t_erl_generator::render_const_value(t_type* type, t_const_value* value) { std::ostringstream out; if (type->is_base_type()) { @@ -297,7 +297,7 @@ string t_alterl_generator::render_const_value(t_type* type, t_const_value* value /** * Generates a struct */ -void t_alterl_generator::generate_struct(t_struct* tstruct) { +void t_erl_generator::generate_struct(t_struct* tstruct) { generate_erl_struct(tstruct, false); } @@ -307,14 +307,14 @@ void t_alterl_generator::generate_struct(t_struct* tstruct) { * * @param txception The struct definition */ -void t_alterl_generator::generate_xception(t_struct* txception) { +void t_erl_generator::generate_xception(t_struct* txception) { generate_erl_struct(txception, true); } /** * Generates a struct */ -void t_alterl_generator::generate_erl_struct(t_struct* tstruct, +void t_erl_generator::generate_erl_struct(t_struct* tstruct, bool is_exception) { generate_erl_struct_definition(f_types_, f_types_hrl_file_, tstruct, is_exception); } @@ -324,7 +324,7 @@ void t_alterl_generator::generate_erl_struct(t_struct* tstruct, * * @param tstruct The struct definition */ -void t_alterl_generator::generate_erl_struct_definition(ostream& out, +void t_erl_generator::generate_erl_struct_definition(ostream& out, ostream& hrl_out, t_struct* tstruct, bool is_exception, @@ -372,7 +372,7 @@ void t_alterl_generator::generate_erl_struct_definition(ostream& out, /** * Generates the read method for a struct */ -void t_alterl_generator::generate_erl_struct_info(ostream& out, +void t_erl_generator::generate_erl_struct_info(ostream& out, t_struct* tstruct) { string name = type_name(tstruct); @@ -391,7 +391,7 @@ void t_alterl_generator::generate_erl_struct_info(ostream& out, * * @param tservice The service definition */ -void t_alterl_generator::generate_service(t_service* tservice) { +void t_erl_generator::generate_service(t_service* tservice) { // somehow this point is reached before the constructor and it's not downcased yet // ...awesome service_name_[0] = tolower(service_name_[0]); @@ -448,7 +448,7 @@ void t_alterl_generator::generate_service(t_service* tservice) { * * @param tservice The service to generate a header definition for */ -void t_alterl_generator::generate_service_helpers(t_service* tservice) { +void t_erl_generator::generate_service_helpers(t_service* tservice) { vector functions = tservice->get_functions(); vector::iterator f_iter; @@ -468,7 +468,7 @@ void t_alterl_generator::generate_service_helpers(t_service* tservice) { * * @param tfunction The function */ -void t_alterl_generator::generate_erl_function_helpers(t_function* tfunction) { +void t_erl_generator::generate_erl_function_helpers(t_function* tfunction) { } /** @@ -476,7 +476,7 @@ void t_alterl_generator::generate_erl_function_helpers(t_function* tfunction) { * * @param tservice The service to generate a header definition for */ -void t_alterl_generator::generate_service_interface(t_service* tservice) { +void t_erl_generator::generate_service_interface(t_service* tservice) { export_string("function_info", 2); @@ -510,7 +510,7 @@ void t_alterl_generator::generate_service_interface(t_service* tservice) { * Generates a function_info(FunctionName, params_type) and * function_info(FunctionName, reply_type) */ -void t_alterl_generator::generate_function_info(t_service* tservice, +void t_erl_generator::generate_function_info(t_service* tservice, t_function* tfunction) { string name_atom = "'" + tfunction->get_name() + "'"; @@ -556,7 +556,7 @@ void t_alterl_generator::generate_function_info(t_service* tservice, * * @param ttype The type */ -string t_alterl_generator::declare_field(t_field* tfield) { // TODO +string t_erl_generator::declare_field(t_field* tfield) { // TODO string result = "@" + tfield->get_name(); t_type* type = get_true_type(tfield->get_type()); if (tfield->get_value() != NULL) { @@ -573,7 +573,7 @@ string t_alterl_generator::declare_field(t_field* tfield) { // TODO * @param tfunction Function definition * @return String of rendered function definition */ -string t_alterl_generator::function_signature(t_function* tfunction, +string t_erl_generator::function_signature(t_function* tfunction, string prefix) { return prefix + tfunction->get_name() + @@ -583,7 +583,7 @@ string t_alterl_generator::function_signature(t_function* tfunction, /** * Add a function to the exports list */ -void t_alterl_generator::export_string(string name, int num) { +void t_erl_generator::export_string(string name, int num) { if (export_lines_first_) { export_lines_first_ = false; } else { @@ -592,7 +592,7 @@ void t_alterl_generator::export_string(string name, int num) { export_lines_ << name << "/" << num; } -void t_alterl_generator::export_types_function(t_function* tfunction, +void t_erl_generator::export_types_function(t_function* tfunction, string prefix) { export_types_string(prefix + tfunction->get_name(), @@ -601,7 +601,7 @@ void t_alterl_generator::export_types_function(t_function* tfunction, ); } -void t_alterl_generator::export_types_string(string name, int num) { +void t_erl_generator::export_types_string(string name, int num) { if (export_types_lines_first_) { export_types_lines_first_ = false; } else { @@ -610,7 +610,7 @@ void t_alterl_generator::export_types_string(string name, int num) { export_types_lines_ << name << "/" << num; } -void t_alterl_generator::export_function(t_function* tfunction, +void t_erl_generator::export_function(t_function* tfunction, string prefix) { export_string(prefix + tfunction->get_name(), @@ -623,7 +623,7 @@ void t_alterl_generator::export_function(t_function* tfunction, /** * Renders a field list */ -string t_alterl_generator::argument_list(t_struct* tstruct) { +string t_erl_generator::argument_list(t_struct* tstruct) { string result = ""; const vector& fields = tstruct->get_members(); @@ -641,7 +641,7 @@ string t_alterl_generator::argument_list(t_struct* tstruct) { return result; } -string t_alterl_generator::type_name(t_type* ttype) { +string t_erl_generator::type_name(t_type* ttype) { string prefix = ""; string name = ttype->get_name(); @@ -655,7 +655,7 @@ string t_alterl_generator::type_name(t_type* ttype) { /** * Converts the parse type to a Erlang "type" (macro for int constants) */ -string t_alterl_generator::type_to_enum(t_type* type) { +string t_erl_generator::type_to_enum(t_type* type) { type = get_true_type(type); if (type->is_base_type()) { @@ -697,7 +697,7 @@ string t_alterl_generator::type_to_enum(t_type* type) { /** * Generate an Erlang term which represents a thrift type */ -std::string t_alterl_generator::generate_type_term(t_type* type, +std::string t_erl_generator::generate_type_term(t_type* type, bool expand_structs) { type = get_true_type(type); @@ -773,6 +773,6 @@ std::string t_alterl_generator::generate_type_term(t_type* type, throw "INVALID TYPE IN type_to_enum: " + type->get_name(); } -std::string t_alterl_generator::type_module(t_type* ttype) { +std::string t_erl_generator::type_module(t_type* ttype) { return uncapitalize(ttype->get_program()->get_name()) + "_types"; } diff --git a/compiler/cpp/src/generate/t_alterl_generator.h b/compiler/cpp/src/generate/t_erl_generator.h similarity index 95% rename from compiler/cpp/src/generate/t_alterl_generator.h rename to compiler/cpp/src/generate/t_erl_generator.h index 6e7e12e5..79ac3755 100644 --- a/compiler/cpp/src/generate/t_alterl_generator.h +++ b/compiler/cpp/src/generate/t_erl_generator.h @@ -1,5 +1,5 @@ -#ifndef T_ALTERL_GENERATOR_H -#define T_ALTERL_GENERATOR_H +#ifndef T_ERL_GENERATOR_H +#define T_ERL_GENERATOR_H #include #include @@ -13,9 +13,9 @@ * * @author */ -class t_alterl_generator : public t_generator { +class t_erl_generator : public t_generator { public: - t_alterl_generator(t_program* program) : + t_erl_generator(t_program* program) : t_generator(program) { program_name_[0] = tolower(program_name_[0]); diff --git a/compiler/cpp/src/main.cc b/compiler/cpp/src/main.cc index 7fcab639..f2f3a9b1 100644 --- a/compiler/cpp/src/main.cc +++ b/compiler/cpp/src/main.cc @@ -38,7 +38,7 @@ #include "parse/t_scope.h" #include "generate/t_php_generator.h" #include "generate/t_xsd_generator.h" -#include "generate/t_alterl_generator.h" +#include "generate/t_erl_generator.h" using namespace std; @@ -151,7 +151,7 @@ bool gen_phpa = false; bool gen_phpo = false; bool gen_rest = false; bool gen_perl = false; -bool gen_alterl = false; +bool gen_erl = false; bool gen_ocaml = false; bool gen_hs = false; bool gen_cocoa = false; @@ -601,7 +601,7 @@ void usage() { 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, " -alterl Generate Alternative Erlang output files\n"); + fprintf(stderr, " -erl Generate Erlang output files\n"); fprintf(stderr, " -o dir Set the output directory for gen-* packages\n"); fprintf(stderr, " (default: current directory)\n"); fprintf(stderr, " -I dir Add a directory to the list of directories\n"); @@ -871,11 +871,11 @@ void generate(t_program* program, const vector& generator_strings) { delete xsd; } - if (gen_alterl) { - pverbose("Generating Alternative Erlang\n"); - t_alterl_generator* alterl = new t_alterl_generator(program); - alterl->generate_program(); - delete alterl; + if (gen_erl) { + pverbose("Generating Erlang\n"); + t_erl_generator* erl = new t_erl_generator(program); + erl->generate_program(); + delete erl; } if (dump_docs) { @@ -992,8 +992,8 @@ int main(int argc, char** argv) { gen_xsd = true; } else if (strcmp(arg, "-perl") == 0) { gen_perl = true; - } else if (strcmp(arg, "-alterl") == 0) { - gen_alterl = true; + } else if (strcmp(arg, "-erl") == 0) { + gen_erl = true; } else if (strcmp(arg, "-ocaml") == 0) { gen_ocaml = true; } else if (strcmp(arg, "-hs") == 0) { @@ -1105,7 +1105,7 @@ int main(int argc, char** argv) { } // You gotta generate something! - if (!gen_php && !gen_phpi && !gen_xsd && !gen_alterl && generator_strings.empty()) { + if (!gen_php && !gen_phpi && !gen_xsd && !gen_erl && generator_strings.empty()) { fprintf(stderr, "!!! No output language(s) specified\n\n"); usage(); } diff --git a/lib/Makefile.am b/lib/Makefile.am index 8cbb80f2..58ef555b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -11,7 +11,7 @@ SUBDIRS += java endif if ENABLE_ERLANG -SUBDIRS += alterl +SUBDIRS += erl endif EXTRA_DIST = \ diff --git a/lib/alterl/COPYING b/lib/erl/COPYING similarity index 100% rename from lib/alterl/COPYING rename to lib/erl/COPYING diff --git a/lib/alterl/LICENSE b/lib/erl/LICENSE similarity index 100% rename from lib/alterl/LICENSE rename to lib/erl/LICENSE diff --git a/lib/alterl/Makefile b/lib/erl/Makefile similarity index 100% rename from lib/alterl/Makefile rename to lib/erl/Makefile diff --git a/lib/alterl/README b/lib/erl/README similarity index 100% rename from lib/alterl/README rename to lib/erl/README diff --git a/lib/alterl/build/beamver b/lib/erl/build/beamver similarity index 100% rename from lib/alterl/build/beamver rename to lib/erl/build/beamver diff --git a/lib/alterl/build/buildtargets.mk b/lib/erl/build/buildtargets.mk similarity index 100% rename from lib/alterl/build/buildtargets.mk rename to lib/erl/build/buildtargets.mk diff --git a/lib/alterl/build/colors.mk b/lib/erl/build/colors.mk similarity index 100% rename from lib/alterl/build/colors.mk rename to lib/erl/build/colors.mk diff --git a/lib/alterl/build/docs.mk b/lib/erl/build/docs.mk similarity index 100% rename from lib/alterl/build/docs.mk rename to lib/erl/build/docs.mk diff --git a/lib/alterl/build/mime.types b/lib/erl/build/mime.types similarity index 100% rename from lib/alterl/build/mime.types rename to lib/erl/build/mime.types diff --git a/lib/alterl/build/otp.mk b/lib/erl/build/otp.mk similarity index 100% rename from lib/alterl/build/otp.mk rename to lib/erl/build/otp.mk diff --git a/lib/alterl/build/otp_subdir.mk b/lib/erl/build/otp_subdir.mk similarity index 100% rename from lib/alterl/build/otp_subdir.mk rename to lib/erl/build/otp_subdir.mk diff --git a/lib/alterl/build/raw_test.mk b/lib/erl/build/raw_test.mk similarity index 100% rename from lib/alterl/build/raw_test.mk rename to lib/erl/build/raw_test.mk diff --git a/lib/alterl/include/thrift_constants.hrl b/lib/erl/include/thrift_constants.hrl similarity index 100% rename from lib/alterl/include/thrift_constants.hrl rename to lib/erl/include/thrift_constants.hrl diff --git a/lib/alterl/include/thrift_protocol.hrl b/lib/erl/include/thrift_protocol.hrl similarity index 100% rename from lib/alterl/include/thrift_protocol.hrl rename to lib/erl/include/thrift_protocol.hrl diff --git a/lib/alterl/src/Makefile b/lib/erl/src/Makefile similarity index 100% rename from lib/alterl/src/Makefile rename to lib/erl/src/Makefile diff --git a/lib/alterl/src/test_handler.erl b/lib/erl/src/test_handler.erl similarity index 100% rename from lib/alterl/src/test_handler.erl rename to lib/erl/src/test_handler.erl diff --git a/lib/alterl/src/test_service.erl b/lib/erl/src/test_service.erl similarity index 100% rename from lib/alterl/src/test_service.erl rename to lib/erl/src/test_service.erl diff --git a/lib/alterl/src/thrift.app.src b/lib/erl/src/thrift.app.src similarity index 100% rename from lib/alterl/src/thrift.app.src rename to lib/erl/src/thrift.app.src diff --git a/lib/alterl/src/thrift.appup.src b/lib/erl/src/thrift.appup.src similarity index 100% rename from lib/alterl/src/thrift.appup.src rename to lib/erl/src/thrift.appup.src diff --git a/lib/alterl/src/thrift_base64_transport.erl b/lib/erl/src/thrift_base64_transport.erl similarity index 100% rename from lib/alterl/src/thrift_base64_transport.erl rename to lib/erl/src/thrift_base64_transport.erl diff --git a/lib/alterl/src/thrift_binary_protocol.erl b/lib/erl/src/thrift_binary_protocol.erl similarity index 100% rename from lib/alterl/src/thrift_binary_protocol.erl rename to lib/erl/src/thrift_binary_protocol.erl diff --git a/lib/alterl/src/thrift_buffered_transport.erl b/lib/erl/src/thrift_buffered_transport.erl similarity index 100% rename from lib/alterl/src/thrift_buffered_transport.erl rename to lib/erl/src/thrift_buffered_transport.erl diff --git a/lib/alterl/src/thrift_client.erl b/lib/erl/src/thrift_client.erl similarity index 100% rename from lib/alterl/src/thrift_client.erl rename to lib/erl/src/thrift_client.erl diff --git a/lib/alterl/src/thrift_disk_log_transport.erl b/lib/erl/src/thrift_disk_log_transport.erl similarity index 100% rename from lib/alterl/src/thrift_disk_log_transport.erl rename to lib/erl/src/thrift_disk_log_transport.erl diff --git a/lib/alterl/src/thrift_file_transport.erl b/lib/erl/src/thrift_file_transport.erl similarity index 100% rename from lib/alterl/src/thrift_file_transport.erl rename to lib/erl/src/thrift_file_transport.erl diff --git a/lib/alterl/src/thrift_framed_transport.erl b/lib/erl/src/thrift_framed_transport.erl similarity index 100% rename from lib/alterl/src/thrift_framed_transport.erl rename to lib/erl/src/thrift_framed_transport.erl diff --git a/lib/alterl/src/thrift_http_transport.erl b/lib/erl/src/thrift_http_transport.erl similarity index 100% rename from lib/alterl/src/thrift_http_transport.erl rename to lib/erl/src/thrift_http_transport.erl diff --git a/lib/alterl/src/thrift_processor.erl b/lib/erl/src/thrift_processor.erl similarity index 100% rename from lib/alterl/src/thrift_processor.erl rename to lib/erl/src/thrift_processor.erl diff --git a/lib/alterl/src/thrift_protocol.erl b/lib/erl/src/thrift_protocol.erl similarity index 100% rename from lib/alterl/src/thrift_protocol.erl rename to lib/erl/src/thrift_protocol.erl diff --git a/lib/alterl/src/thrift_server.erl b/lib/erl/src/thrift_server.erl similarity index 100% rename from lib/alterl/src/thrift_server.erl rename to lib/erl/src/thrift_server.erl diff --git a/lib/alterl/src/thrift_service.erl b/lib/erl/src/thrift_service.erl similarity index 100% rename from lib/alterl/src/thrift_service.erl rename to lib/erl/src/thrift_service.erl diff --git a/lib/alterl/src/thrift_socket_server.erl b/lib/erl/src/thrift_socket_server.erl similarity index 100% rename from lib/alterl/src/thrift_socket_server.erl rename to lib/erl/src/thrift_socket_server.erl diff --git a/lib/alterl/src/thrift_socket_transport.erl b/lib/erl/src/thrift_socket_transport.erl similarity index 100% rename from lib/alterl/src/thrift_socket_transport.erl rename to lib/erl/src/thrift_socket_transport.erl diff --git a/lib/alterl/src/thrift_transport.erl b/lib/erl/src/thrift_transport.erl similarity index 100% rename from lib/alterl/src/thrift_transport.erl rename to lib/erl/src/thrift_transport.erl diff --git a/lib/alterl/vsn.mk b/lib/erl/vsn.mk similarity index 100% rename from lib/alterl/vsn.mk rename to lib/erl/vsn.mk diff --git a/test/erl/Makefile b/test/erl/Makefile index 890c8094..8dc756a5 100644 --- a/test/erl/Makefile +++ b/test/erl/Makefile @@ -7,7 +7,7 @@ INCLUDEDIR=include TARGETDIR=ebin SRCDIR=src -ALL_INCLUDEDIR=$(GEN_INCLUDEDIR) $(INCLUDEDIR) ../../lib/alterl/include +ALL_INCLUDEDIR=$(GEN_INCLUDEDIR) $(INCLUDEDIR) ../../lib/erl/include INCLUDEFLAGS=$(patsubst %,-I%, ${ALL_INCLUDEDIR}) MODULES = stress_server test_server test_disklog @@ -24,8 +24,8 @@ THRIFT = ../../compiler/cpp/thrift ${GENDIR}/: ${RPCFILE} rm -rf ${GENDIR} - ${THRIFT} -alterl ${TEST_RPCFILE} - ${THRIFT} -alterl ${STRESS_RPCFILE} + ${THRIFT} -erl ${TEST_RPCFILE} + ${THRIFT} -erl ${STRESS_RPCFILE} mkdir -p ${GEN_INCLUDEDIR} mkdir -p ${GEN_SRCDIR} mkdir -p ${GEN_TARGETDIR} diff --git a/tutorial/alterl/client.erl b/tutorial/erl/client.erl similarity index 100% rename from tutorial/alterl/client.erl rename to tutorial/erl/client.erl diff --git a/tutorial/alterl/client.sh b/tutorial/erl/client.sh similarity index 100% rename from tutorial/alterl/client.sh rename to tutorial/erl/client.sh diff --git a/tutorial/alterl/server.erl b/tutorial/erl/server.erl similarity index 100% rename from tutorial/alterl/server.erl rename to tutorial/erl/server.erl diff --git a/tutorial/alterl/server.sh b/tutorial/erl/server.sh similarity index 93% rename from tutorial/alterl/server.sh rename to tutorial/erl/server.sh index a2d0d99b..f101e7a0 100755 --- a/tutorial/alterl/server.sh +++ b/tutorial/erl/server.sh @@ -1,6 +1,6 @@ #!/bin/sh -ERL_THRIFT=../../lib/alterl +ERL_THRIFT=../../lib/erl if ! [ -d ${ERL_THRIFT}/ebin ]; then echo "Please build the Thrift library by running \`make' in ${ERL_THRIFT}" -- 2.17.1