THRIFT-2768: Whitespace Fixup
Client: General (Makefile.am, *.thrift)
Patch: Jens Geyer
DocTest.thrift has NOT been changed, the trailing whitespaces are part of the test case.
diff --git a/contrib/Rebus/sample.thrift b/contrib/Rebus/sample.thrift
index fe1d21a..785e2d3 100644
--- a/contrib/Rebus/sample.thrift
+++ b/contrib/Rebus/sample.thrift
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-
+
service BasicMathServer {
- oneway void DoTheMath( 1: i32 arg1, 2: i32 arg2)
- oneway void Ping(1: i64 value)
+ oneway void DoTheMath( 1: i32 arg1, 2: i32 arg2)
+ oneway void Ping(1: i64 value)
}
service BasicMathClient {
- oneway void ThreeResults( 1 : i32 added, 2 : i32 multiplied, 3 : i32 subtracted);
- oneway void FourResults( 1 : i32 added, 2 : i32 multiplied, 3 : i32 subtracted, 4 : i32 divided);
- oneway void Pong(1: i64 value)
+ oneway void ThreeResults( 1 : i32 added, 2 : i32 multiplied, 3 : i32 subtracted);
+ oneway void FourResults( 1 : i32 added, 2 : i32 multiplied, 3 : i32 subtracted, 4 : i32 divided);
+ oneway void Pong(1: i64 value)
}
diff --git a/contrib/fb303/cpp/Makefile.am b/contrib/fb303/cpp/Makefile.am
index 748d329..bb1cb60 100644
--- a/contrib/fb303/cpp/Makefile.am
+++ b/contrib/fb303/cpp/Makefile.am
@@ -38,7 +38,7 @@
AM_CPPFLAGS = -I..
AM_CPPFLAGS += -Igen-cpp
-AM_CPPFLAGS += -I$(thrift_home)/include/thrift
+AM_CPPFLAGS += -I$(thrift_home)/include/thrift
AM_CPPFLAGS += $(BOOST_CPPFLAGS)
AM_CPPFLAGS += $(FB_CPPFLAGS) $(DEBUG_CPPFLAGS)
diff --git a/contrib/fb303/py/Makefile.am b/contrib/fb303/py/Makefile.am
index 060495e..dc8c037 100644
--- a/contrib/fb303/py/Makefile.am
+++ b/contrib/fb303/py/Makefile.am
@@ -23,22 +23,22 @@
all:
all-local:
- $(thrift_home)/bin/thrift --gen py $(top_srcdir)/if/fb303.thrift
- mv gen-py/fb303/* fb303
- $(PYTHON) setup.py build
+ $(thrift_home)/bin/thrift --gen py $(top_srcdir)/if/fb303.thrift
+ mv gen-py/fb303/* fb303
+ $(PYTHON) setup.py build
# We're ignoring prefix here because site-packages seems to be
# the equivalent of /usr/local/lib in Python land.
# Old version (can't put inline because it's not portable).
#$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) $(PYTHON_SETUPUTIL_ARGS)
install-exec-hook:
- $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
-clean: clean-local
+clean: clean-local
clean-local:
- $(RM) -r build
+ $(RM) -r build
check-local: all