diff options
| author | Mario Emmenlauer <mario@emmenlauer.de> | 2018-06-07 15:52:17 +0200 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2018-06-07 09:52:17 -0400 |
| commit | 4d10279244838383154003ea733487f7349fa690 (patch) | |
| tree | 57e57a2885c1900e5545d9c139d8a9ca14befee7 /tutorial/erl | |
| parent | 9edecce91a2a32639a222cf82459070c3661074b (diff) | |
| download | thrift-4d10279244838383154003ea733487f7349fa690.tar.gz | |
THRIFT-4580: fix erlang tutorial unpack on windows (#1561)
Diffstat (limited to 'tutorial/erl')
| -rwxr-xr-x[l---------] | tutorial/erl/client.sh | 38 | ||||
| l---------[-rwxr-xr-x] | tutorial/erl/server.sh | 38 |
2 files changed, 38 insertions, 38 deletions
diff --git a/tutorial/erl/client.sh b/tutorial/erl/client.sh index a417e0da9..775afb62d 120000..100755 --- a/tutorial/erl/client.sh +++ b/tutorial/erl/client.sh @@ -1 +1,37 @@ -server.sh
\ No newline at end of file +#!/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 index 775afb62d..26b3c58e4 100755..120000 --- a/tutorial/erl/server.sh +++ b/tutorial/erl/server.sh @@ -1,37 +1 @@ -#!/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 +client.sh
\ No newline at end of file |