Merge branch 'master' of https://github.com/CRImier/astyle

Author: CRImier

patches/java_includes.patch

@@ -1,13 +1,13 @@
 Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
 ===================================================================
---- AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj	(revisione 450)
+--- AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj	(revisione 471)
 +++ AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj	(copia locale)
 @@ -109,7 +109,7 @@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_DEBUG;ASTYLE_JNI</PreprocessorDefinitions>
        <MinimalRebuild>true</MinimalRebuild>
        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -16,7 +16,7 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
      <ClCompile>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_DEBUG;ASTYLE_JNI</PreprocessorDefinitions>
        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -25,7 +25,7 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 -      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
        <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -34,7 +34,7 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 -      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
        <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -43,7 +43,7 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 -      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
        <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -52,13 +52,13 @@ Index: AStyle/build/vs2010/AStyleJava/AStyleJava.vcxproj
        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 -      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.7.0_55\include;C:\Program Files (x86)\Java\jdk1.7.0_55\include\win32</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.6.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.6.0_45\include</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_45\include\win32;C:\Program Files (x86)\Java\jdk1.8.0_45\include</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>NDEBUG;ASTYLE_JNI</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
        <RuntimeTypeInfo>false</RuntimeTypeInfo>
 Index: AStyle/build/gcc/Makefile
 ===================================================================
---- AStyle/build/gcc/Makefile	(revisione 450)
+--- AStyle/build/gcc/Makefile	(revisione 471)
 +++ AStyle/build/gcc/Makefile	(copia locale)
 @@ -33,7 +33,7 @@
  objdir = obj

patches/java_package_name.patch

@@ -1,8 +1,8 @@
 Index: AStyle/src/astyle_main.cpp
 ===================================================================
---- AStyle/src/astyle_main.cpp	(revisione 450)
+--- AStyle/src/astyle_main.cpp	(revisione 471)
 +++ AStyle/src/astyle_main.cpp	(copia locale)
-@@ -3538,7 +3538,7 @@
+@@ -3550,7 +3550,7 @@
  // called by a java program to get the version number
  // the function name is constructed from method names in the calling java program
  extern "C"  EXPORT
@@ -11,7 +11,7 @@ Index: AStyle/src/astyle_main.cpp
  {
  	return env->NewStringUTF(g_version);
  }
-@@ -3546,7 +3546,7 @@
+@@ -3558,7 +3558,7 @@
  // called by a java program to format the source code
  // the function name is constructed from method names in the calling java program
  extern "C"  EXPORT
@@ -22,9 +22,9 @@ Index: AStyle/src/astyle_main.cpp
                                                  jstring optionsJava)
 Index: AStyle/src/astyle_main.h
 ===================================================================
---- AStyle/src/astyle_main.h	(revisione 450)
+--- AStyle/src/astyle_main.h	(revisione 471)
 +++ AStyle/src/astyle_main.h	(copia locale)
-@@ -421,9 +421,9 @@
+@@ -422,9 +422,9 @@
  char* STDCALL javaMemoryAlloc(unsigned long memoryNeeded);
  // the following function names are constructed from method names in the calling java program
  extern "C" EXPORT

setup.bash

@@ -2,7 +2,7 @@
 
 rm -rf astyle-code
 
-svn co svn://svn.code.sf.net/p/astyle/code/tags/2.05 astyle-code
+svn co svn://svn.code.sf.net/p/astyle/code/tags/2.05.1 astyle-code
 
 cd astyle-code
 for f in `ls ../patches/*.patch` ; do