summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorRobert Antoni Buj i Gelonch <robert.buj@gmail.com>2014-09-25 15:50:05 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-09-25 16:06:23 +0200
commit09b13e1e4c6667b307fdd9608a02d2a792efd940 (patch)
tree1bf48a0dd2469a1e4ff96caed5831ad07fb49010 /scripting
parent9791453283407a0a129a71767a290058ac759da2 (diff)
scripting: astyle-java.conf -> astyle.options
Reviewed on: https://gerrit.libreoffice.org/11639 Change-Id: I0852f9766495379b0208e236b3cbeafde5bf07b3
Diffstat (limited to 'scripting')
-rwxr-xr-xscripting/Format_java_code.sh2
-rw-r--r--scripting/README5
-rwxr-xr-xscripting/astyle.options (renamed from scripting/astyle-java.conf)0
3 files changed, 6 insertions, 1 deletions
diff --git a/scripting/Format_java_code.sh b/scripting/Format_java_code.sh
index edf75d1c5ea6..8fbffe884790 100755
--- a/scripting/Format_java_code.sh
+++ b/scripting/Format_java_code.sh
@@ -1,2 +1,2 @@
#!/bin/bash
-astyle --options=astyle-java.conf --verbose --recursive ./*.java
+astyle --options=astyle.options --verbose --recursive ./*.java
diff --git a/scripting/README b/scripting/README
index f19fa3b21fea..1ca4fe97bdd9 100644
--- a/scripting/README
+++ b/scripting/README
@@ -3,6 +3,11 @@ This module provides the source code for the Scripting Framework.
For more information on the Scripting Framework, see the project web page:
[http://framework.openoffice.org/scripting/]
+This module uses astyle to keep consistent java coding style. Please run
+
+./Format_java_code.sh
+
+before committing.
== Source Code Structure ==
diff --git a/scripting/astyle-java.conf b/scripting/astyle.options
index 3a6ea94f85d0..3a6ea94f85d0 100755
--- a/scripting/astyle-java.conf
+++ b/scripting/astyle.options