This is an automated email from the ASF dual-hosted git repository. jking pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push: new 4d10279 THRIFT-4580: fix erlang tutorial unpack on windows (#1561) 4d10279 is described below commit 4d10279244838383154003ea733487f7349fa690 Author: Mario Emmenlauer <ma...@emmenlauer.de> AuthorDate: Thu Jun 7 15:52:17 2018 +0200 THRIFT-4580: fix erlang tutorial unpack on windows (#1561) --- tutorial/erl/client.sh | 38 +++++++++++++++++++++++++++++++++++++- tutorial/erl/server.sh | 38 +------------------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/tutorial/erl/client.sh b/tutorial/erl/client.sh deleted file mode 120000 index a417e0d..0000000 --- a/tutorial/erl/client.sh +++ /dev/null @@ -1 +0,0 @@ -server.sh \ No newline at end of file diff --git a/tutorial/erl/client.sh b/tutorial/erl/client.sh new file mode 100755 index 0000000..775afb6 --- /dev/null +++ b/tutorial/erl/client.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +# +# 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. +# + +ERL_THRIFT=../../lib/erl + +if ! [ -d ${ERL_THRIFT}/ebin ]; then + echo "Please build the Thrift library by running \`make' in ${ERL_THRIFT}" + exit 1 +fi + +if ! [ -d gen-erl ]; then + ../../compiler/cpp/thrift -r --gen erl ../tutorial.thrift +fi + + +erlc -I ${ERL_THRIFT}/include -I ${ERL_THRIFT}/ebin \ + -I gen-erl -o gen-erl gen-erl/*.erl && + erlc -I ${ERL_THRIFT}/include -I gen-erl *.erl && + erl +K true -pa ${ERL_THRIFT}/ebin -pa gen-erl diff --git a/tutorial/erl/server.sh b/tutorial/erl/server.sh deleted file mode 100755 index 775afb6..0000000 --- a/tutorial/erl/server.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -# -# 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. -# - -ERL_THRIFT=../../lib/erl - -if ! [ -d ${ERL_THRIFT}/ebin ]; then - echo "Please build the Thrift library by running \`make' in ${ERL_THRIFT}" - exit 1 -fi - -if ! [ -d gen-erl ]; then - ../../compiler/cpp/thrift -r --gen erl ../tutorial.thrift -fi - - -erlc -I ${ERL_THRIFT}/include -I ${ERL_THRIFT}/ebin \ - -I gen-erl -o gen-erl gen-erl/*.erl && - erlc -I ${ERL_THRIFT}/include -I gen-erl *.erl && - erl +K true -pa ${ERL_THRIFT}/ebin -pa gen-erl diff --git a/tutorial/erl/server.sh b/tutorial/erl/server.sh new file mode 120000 index 0000000..26b3c58 --- /dev/null +++ b/tutorial/erl/server.sh @@ -0,0 +1 @@ +client.sh \ No newline at end of file -- To stop receiving notification emails like this one, please contact jk...@apache.org.