Skip to content

Commit 88e778f

Browse files
ffissoreffissore
committed
Upgrading to astyle 2.05
1 parent 527f374 commit 88e778f

File tree

6 files changed

+77
-34
lines changed

6 files changed

+77
-34
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
astyle-code
22
*.so
3+
*.jnilib
4+
*.dll

‎linux.bash

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ make clean
66

77
CFLAGS="-m64 -Os" LDFLAGS="-m64 -s" make java
88

9-
cp bin/libastylej.so ../../../../libastylej64.so
9+
cp bin/libastyle*.so ../../../../libastylej64.so
1010

1111
make clean
1212

1313
CFLAGS="-m32 -Os" LDFLAGS="-m32 -s" make java
1414

15-
cp bin/libastylej.so ../../../../libastylej32.so
15+
cp bin/libastyle*.so ../../../../libastylej32.so
1616

‎macosx.bash

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
#!/bin/bash -e
22

3-
if [ "x$JAVA_HOME" == "x" ] ; then
4-
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/"
5-
fi
6-
73
cd astyle-code/AStyle/build/mac/
84

95
make clean
106

117
CFLAGS="-arch i386 -arch x86_64 -Os" LDFLAGS="-arch i386 -arch x86_64 -liconv" make java
128

13-
cp bin/libastylej.dylib ../../../../libastylej.jnilib
9+
cp bin/libastyle*.dylib ../../../../libastylej.jnilib
1410

‎patches/java_includes.patch

+59-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,64 @@
1+
Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
2+
===================================================================
3+
--- AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj (revisione 450)
4+
+++ AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj (copia locale)
5+
@@ -109,7 +109,7 @@
6+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7+
<ClCompile>
8+
<Optimization>Disabled</Optimization>
9+
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
10+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
11+
<PreprocessorDefinitions>_DEBUG;ASTYLE_JNI</PreprocessorDefinitions>
12+
<MinimalRebuild>true</MinimalRebuild>
13+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
14+
@@ -132,7 +132,7 @@
15+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
16+
<ClCompile>
17+
<Optimization>Disabled</Optimization>
18+
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
19+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
20+
<PreprocessorDefinitions>_DEBUG;ASTYLE_JNI</PreprocessorDefinitions>
21+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
22+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
23+
@@ -153,7 +153,7 @@
24+
<ClCompile>
25+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
26+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
27+
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
28+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
29+
<PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
30+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
31+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
32+
@@ -177,7 +177,7 @@
33+
<ClCompile>
34+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
35+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
36+
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
37+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
38+
<PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
39+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
40+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
41+
@@ -201,7 +201,7 @@
42+
<ClCompile>
43+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
44+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
45+
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
46+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
47+
<PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
48+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
49+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
50+
@@ -225,7 +225,7 @@
51+
<ClCompile>
52+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
53+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
54+
- <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
55+
+ <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
56+
<PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
57+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
58+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
159
Index: AStyle/build/gcc/Makefile
260
===================================================================
3-
--- AStyle/build/gcc/Makefile (revisione 398)
61+
--- AStyle/build/gcc/Makefile (revisione 450)
462
+++ AStyle/build/gcc/Makefile (copia locale)
563
@@ -33,7 +33,7 @@
664
objdir = obj
@@ -11,16 +69,3 @@ Index: AStyle/build/gcc/Makefile
1169
CXX = g++
1270
INSTALL=install -o $(USER) -g $(USER)
1371

14-
Index: AStyle/build/mac/Makefile
15-
===================================================================
16-
--- AStyle/build/mac/Makefile (revisione 398)
17-
+++ AStyle/build/mac/Makefile (copia locale)
18-
@@ -37,7 +37,7 @@
19-
objdir = obj
20-
ipath=$(prefix)/bin
21-
CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions
22-
-JAVAINCS = -I$(JAVA_HOME)/include
23-
+JAVAINCS = -I$(JAVA_HOME)
24-
CXX = g++
25-
INSTALL=install -o $(USER) -g $(USER)
26-
# INSTALL=install -o 0 -g 0

‎patches/java_package_name.patch

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Index: AStyle/src/astyle_main.cpp
22
===================================================================
3-
--- AStyle/src/astyle_main.cpp (revisione 431)
3+
--- AStyle/src/astyle_main.cpp (revisione 450)
44
+++ AStyle/src/astyle_main.cpp (copia locale)
5-
@@ -3469,7 +3469,7 @@
5+
@@ -3538,7 +3538,7 @@
66
// called by a java program to get the version number
77
// the function name is constructed from method names in the calling java program
88
extern "C" EXPORT
@@ -11,7 +11,7 @@ Index: AStyle/src/astyle_main.cpp
1111
{
1212
return env->NewStringUTF(g_version);
1313
}
14-
@@ -3477,7 +3477,7 @@
14+
@@ -3546,7 +3546,7 @@
1515
// called by a java program to format the source code
1616
// the function name is constructed from method names in the calling java program
1717
extern "C" EXPORT
@@ -22,17 +22,17 @@ Index: AStyle/src/astyle_main.cpp
2222
jstring optionsJava)
2323
Index: AStyle/src/astyle_main.h
2424
===================================================================
25-
--- AStyle/src/astyle_main.h (revisione 431)
25+
--- AStyle/src/astyle_main.h (revisione 450)
2626
+++ AStyle/src/astyle_main.h (copia locale)
27-
@@ -353,9 +353,9 @@
27+
@@ -421,9 +421,9 @@
2828
char* STDCALL javaMemoryAlloc(unsigned long memoryNeeded);
2929
// the following function names are constructed from method names in the calling java program
30-
extern "C" EXPORT
30+
extern "C" EXPORT
3131
-jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
3232
+jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
33-
extern "C" EXPORT
34-
-jstring STDCALL Java_AStyleInterface_AStyleMain
35-
+jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain
36-
(JNIEnv* env, jobject obj, jstring textInJava, jstring optionsJava);
37-
#endif // ASTYLE_JNI
38-
33+
extern "C" EXPORT
34+
-jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env,
35+
+jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env,
36+
jobject obj,
37+
jstring textInJava,
38+
jstring optionsJava);

‎setup.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
rm -rf astyle-code
44

5-
svn co svn://svn.code.sf.net/p/astyle/code/tags/2.04 astyle-code
5+
svn co svn://svn.code.sf.net/p/astyle/code/tags/2.05 astyle-code
66

77
cd astyle-code
88
for f in `ls ../patches/*.patch` ; do

0 commit comments

Comments
 (0)