--- a/.hgtags Mon Jun 05 09:08:54 2017 +0100
+++ b/.hgtags Fri Aug 11 11:34:41 2017 +0100
@@ -63,6 +63,8 @@
d76245c8ee3769d9c79d5a0b1f6ec7c2ebf4c2b2 expecco_ALM_1_10_0
d76245c8ee3769d9c79d5a0b1f6ec7c2ebf4c2b2 expecco_ALM_1_10_0_8
d76245c8ee3769d9c79d5a0b1f6ec7c2ebf4c2b2 expecco_ALM_1_11_0
+d76245c8ee3769d9c79d5a0b1f6ec7c2ebf4c2b2 expecco_ALM_1_11_0_2
+d76245c8ee3769d9c79d5a0b1f6ec7c2ebf4c2b2 expecco_ALM_1_11_2
e427c77d0e07bf1019d3d021b7c70a9c5a7fef29 expecco_2_7_5a
e6dae94268bd103e466b50ef8f497022682904de expecco_2_9_0
e6dae94268bd103e466b50ef8f497022682904de expecco_2_9_0_win75_lx36
--- a/Make.proto Mon Jun 05 09:08:54 2017 +0100
+++ b/Make.proto Fri Aug 11 11:34:41 2017 +0100
@@ -49,7 +49,7 @@
# ********** OPTIONAL: MODIFY the next line ***
# additional C-libraries that should be pre-linked with the class-objects
-LD_OBJ_LIBS=$(ZLIB_LD_ARG) support/fdlibm/libfdm.a
+LD_OBJ_LIBS=$(ZLIB_LD_ARG) $(LIBFDM)
LOCAL_SHARED_LIBS=
@@ -60,10 +60,23 @@
OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
+ifdef BUILD_TARGET
+LIBFDM_TARGET=$(BUILD_TARGET)
+else
+ifeq ($(CONF),config-linux-x86_64)
+LIBFDM_TARGET=x86_64-pc-linux-gnu
+else ifeq ($(CONF),config-linux-i386)
+LIBFDM_TARGET=i686-pc-linux-gnu
+endif
+endif
+LIBFDM=support/fdlibm/$(LIBFDM_TARGET)/libfdm.a
+
+
+
all:: preMake classLibRule postMake
-pre_objs:: zlib support/fdlibm/libfdm.a
+pre_objs:: zlib $(LIBFDM)
java_clean:
@@ -91,11 +104,11 @@
zlib:
cd $(ZLIB_DIR); $(MAKE) $(MAKE_ZLIB_ARG)
-support/fdlibm/libfdm.a:
- $(MAKE) CCCONFOPT="$(CCCONFOPT) -fPIC" -C support/fdlibm
+$(LIBFDM):
+ $(MAKE) CCCONFOPT="$(CCCONFOPT) -fPIC" OUTDIR=$(LIBFDM_TARGET) -C support/fdlibm
clean::
- $(MAKE) -C support/fdlibm clean
+ $(MAKE) -C OUTDIR=$(LIBFDM_TARGET) support/fdlibm clean
--- a/Make.spec Mon Jun 05 09:08:54 2017 +0100
+++ b/Make.spec Fri Aug 11 11:34:41 2017 +0100
@@ -192,143 +192,143 @@
COMMON_OBJS= \
- $(OUTDIR_SLASH)GroovyCompiler.$(O) \
- $(OUTDIR_SLASH)GroovyEvaluator.$(O) \
- $(OUTDIR_SLASH)GroovyLanguage.$(O) \
- $(OUTDIR_SLASH)GroovySourceFileWriter.$(O) \
- $(OUTDIR_SLASH)JavaAnnotation.$(O) \
- $(OUTDIR_SLASH)JavaAnnotationContainer.$(O) \
- $(OUTDIR_SLASH)JavaAnnotationDefault.$(O) \
- $(OUTDIR_SLASH)JavaAnnotationDictionary.$(O) \
- $(OUTDIR_SLASH)JavaAnnotationValue.$(O) \
- $(OUTDIR_SLASH)JavaArray.$(O) \
- $(OUTDIR_SLASH)JavaBooleanArray.$(O) \
- $(OUTDIR_SLASH)JavaByte.$(O) \
- $(OUTDIR_SLASH)JavaByteCodeProcessor.$(O) \
- $(OUTDIR_SLASH)JavaClassAccessor.$(O) \
- $(OUTDIR_SLASH)JavaClassEnvironment.$(O) \
- $(OUTDIR_SLASH)JavaClassQuery.$(O) \
- $(OUTDIR_SLASH)JavaClassReloader.$(O) \
- $(OUTDIR_SLASH)JavaCodeLibraryOrBundle.$(O) \
- $(OUTDIR_SLASH)JavaCompilerForSmalltalkExtensionsOnly.$(O) \
- $(OUTDIR_SLASH)JavaCompiler_Eclipse.$(O) \
- $(OUTDIR_SLASH)JavaConstantPool.$(O) \
- $(OUTDIR_SLASH)JavaConstants.$(O) \
- $(OUTDIR_SLASH)JavaContext.$(O) \
- $(OUTDIR_SLASH)JavaDecompiler.$(O) \
- $(OUTDIR_SLASH)JavaDescriptor.$(O) \
- $(OUTDIR_SLASH)JavaError.$(O) \
- $(OUTDIR_SLASH)JavaExceptionTable.$(O) \
- $(OUTDIR_SLASH)JavaField.$(O) \
- $(OUTDIR_SLASH)JavaFinalizationRegistry.$(O) \
- $(OUTDIR_SLASH)JavaInnerClasses.$(O) \
- $(OUTDIR_SLASH)JavaLanguage.$(O) \
- $(OUTDIR_SLASH)JavaLibraries.$(O) \
- $(OUTDIR_SLASH)JavaLocalVariableTable.$(O) \
- $(OUTDIR_SLASH)JavaLocalVariableTableEntry.$(O) \
- $(OUTDIR_SLASH)JavaLookup.$(O) \
- $(OUTDIR_SLASH)JavaMetaclass.$(O) \
- $(OUTDIR_SLASH)JavaMonitor.$(O) \
- $(OUTDIR_SLASH)JavaNameAndType2.$(O) \
- $(OUTDIR_SLASH)JavaNativeMemory.$(O) \
- $(OUTDIR_SLASH)JavaNioSupport.$(O) \
- $(OUTDIR_SLASH)JavaObject.$(O) \
- $(OUTDIR_SLASH)JavaObjectDictionary.$(O) \
- $(OUTDIR_SLASH)JavaPopUpView.$(O) \
- $(OUTDIR_SLASH)JavaProcess.$(O) \
- $(OUTDIR_SLASH)JavaRef2.$(O) \
- $(OUTDIR_SLASH)JavaRelease.$(O) \
- $(OUTDIR_SLASH)JavaResolver.$(O) \
- $(OUTDIR_SLASH)JavaShort.$(O) \
- $(OUTDIR_SLASH)JavaSocket.$(O) \
- $(OUTDIR_SLASH)JavaSourceCodeCache.$(O) \
- $(OUTDIR_SLASH)JavaSourceFileWriter.$(O) \
- $(OUTDIR_SLASH)JavaTestsLoader.$(O) \
- $(OUTDIR_SLASH)JavaTopView.$(O) \
- $(OUTDIR_SLASH)JavaUnresolvedCompilationError.$(O) \
- $(OUTDIR_SLASH)JavaUnresolvedConstant.$(O) \
- $(OUTDIR_SLASH)JavaUtilities.$(O) \
- $(OUTDIR_SLASH)JavaVMData.$(O) \
- $(OUTDIR_SLASH)JavaView.$(O) \
- $(OUTDIR_SLASH)JavaZipDeflater.$(O) \
- $(OUTDIR_SLASH)JavaZipFile.$(O) \
- $(OUTDIR_SLASH)JavaZipInflater.$(O) \
- $(OUTDIR_SLASH)ProxyMethod.$(O) \
- $(OUTDIR_SLASH)ProxyMethodCompiler.$(O) \
- $(OUTDIR_SLASH)ProxyMethodNode.$(O) \
- $(OUTDIR_SLASH)SmalltalkAppletContext.$(O) \
- $(OUTDIR_SLASH)SmalltalkAppletStub.$(O) \
- $(OUTDIR_SLASH)stx_libjava.$(O) \
- $(OUTDIR_SLASH)GroovyMetaclass.$(O) \
- $(OUTDIR_SLASH)Java.$(O) \
- $(OUTDIR_SLASH)JavaAnnotationArrayValue.$(O) \
- $(OUTDIR_SLASH)JavaAnnotationClassValue.$(O) \
- $(OUTDIR_SLASH)JavaAnnotationEnumValue.$(O) \
- $(OUTDIR_SLASH)JavaAnnotationNestedAnnotationValue.$(O) \
- $(OUTDIR_SLASH)JavaAnnotationPrimitiveValue.$(O) \
- $(OUTDIR_SLASH)JavaBehavior.$(O) \
- $(OUTDIR_SLASH)JavaByteCodeDisassembler.$(O) \
- $(OUTDIR_SLASH)JavaByteCodeProcessorAdapter.$(O) \
- $(OUTDIR_SLASH)JavaClassAnnotationContainer.$(O) \
- $(OUTDIR_SLASH)JavaClassMemberRef2.$(O) \
- $(OUTDIR_SLASH)JavaClassReader.$(O) \
- $(OUTDIR_SLASH)JavaClassRef2.$(O) \
- $(OUTDIR_SLASH)JavaClassRegistry.$(O) \
- $(OUTDIR_SLASH)JavaCodeBundle.$(O) \
- $(OUTDIR_SLASH)JavaCodeLibrary.$(O) \
- $(OUTDIR_SLASH)JavaEmbeddedFrameView.$(O) \
- $(OUTDIR_SLASH)JavaFieldAnnotationContainer.$(O) \
- $(OUTDIR_SLASH)JavaFieldDescriptor.$(O) \
- $(OUTDIR_SLASH)JavaFieldDescriptorWithUnionType.$(O) \
- $(OUTDIR_SLASH)JavaInvalidRefError.$(O) \
- $(OUTDIR_SLASH)JavaInvokeDynamic2.$(O) \
- $(OUTDIR_SLASH)JavaMethod.$(O) \
- $(OUTDIR_SLASH)JavaMethodAnnotationContainer.$(O) \
- $(OUTDIR_SLASH)JavaMethodDescriptor.$(O) \
- $(OUTDIR_SLASH)JavaMethodHandle2.$(O) \
- $(OUTDIR_SLASH)JavaMethodType2.$(O) \
- $(OUTDIR_SLASH)JavaMirror.$(O) \
- $(OUTDIR_SLASH)JavaNativeMethodImpl_OpenJDK6.$(O) \
- $(OUTDIR_SLASH)JavaStringRef2.$(O) \
- $(OUTDIR_SLASH)JavaUnhandledExceptionError.$(O) \
- $(OUTDIR_SLASH)JavaUnhandledThreadDeathError.$(O) \
- $(OUTDIR_SLASH)JavaUnresolvedClassConstant.$(O) \
- $(OUTDIR_SLASH)JavaUnresolvedStringConstant.$(O) \
- $(OUTDIR_SLASH)JavaVM.$(O) \
- $(OUTDIR_SLASH)ProxyMethodConditionNode.$(O) \
- $(OUTDIR_SLASH)ProxyMethodGuardNode.$(O) \
- $(OUTDIR_SLASH)ProxyMethodInvocationNode.$(O) \
- $(OUTDIR_SLASH)ProxyMethodJavaFieldAccessor.$(O) \
- $(OUTDIR_SLASH)JavaAlienMirror.$(O) \
- $(OUTDIR_SLASH)JavaArrayMirror.$(O) \
- $(OUTDIR_SLASH)JavaByteCodePreresolver.$(O) \
- $(OUTDIR_SLASH)JavaClass.$(O) \
- $(OUTDIR_SLASH)JavaClassMirror.$(O) \
- $(OUTDIR_SLASH)JavaClassPathBundle.$(O) \
- $(OUTDIR_SLASH)JavaFieldRef2.$(O) \
- $(OUTDIR_SLASH)JavaMethodAnalyzer.$(O) \
- $(OUTDIR_SLASH)JavaMethodRef2.$(O) \
- $(OUTDIR_SLASH)JavaMethodWithException.$(O) \
- $(OUTDIR_SLASH)JavaNativeMethodImpl_AppleJDK6.$(O) \
- $(OUTDIR_SLASH)JavaNativeMethodImpl_OpenJDK7.$(O) \
- $(OUTDIR_SLASH)JavaNativeMethodImpl_SunJDK6.$(O) \
- $(OUTDIR_SLASH)JavaPrimitiveMirror.$(O) \
- $(OUTDIR_SLASH)ProxyMethodAndNode.$(O) \
- $(OUTDIR_SLASH)ProxyMethodBlockInvocationNode.$(O) \
- $(OUTDIR_SLASH)ProxyMethodJavaFieldGetter.$(O) \
- $(OUTDIR_SLASH)ProxyMethodJavaFieldSetter.$(O) \
- $(OUTDIR_SLASH)ProxyMethodMethodInvocationNode.$(O) \
- $(OUTDIR_SLASH)ProxyMethodTypeCheckNode.$(O) \
- $(OUTDIR_SLASH)GroovyClass.$(O) \
- $(OUTDIR_SLASH)JavaInterfaceMethodRef2.$(O) \
- $(OUTDIR_SLASH)JavaMethodWithHandler.$(O) \
- $(OUTDIR_SLASH)JavaNativeMethodImpl_OpenJDK8.$(O) \
- $(OUTDIR_SLASH)JavaNativeMethodImpl_OracleJDK7.$(O) \
- $(OUTDIR_SLASH)ProxyMethodJavaMethodInvocationNode.$(O) \
- $(OUTDIR_SLASH)ProxyMethodJavaTypeCheckNode.$(O) \
- $(OUTDIR_SLASH)JavaNativeMethod.$(O) \
- $(OUTDIR_SLASH)JavaNativeMethodImpl_OracleJDK8.$(O) \
- $(OUTDIR_SLASH)extensions.$(O) \
+ $(OUTDIR)GroovyCompiler.$(O) \
+ $(OUTDIR)GroovyEvaluator.$(O) \
+ $(OUTDIR)GroovyLanguage.$(O) \
+ $(OUTDIR)GroovySourceFileWriter.$(O) \
+ $(OUTDIR)JavaAnnotation.$(O) \
+ $(OUTDIR)JavaAnnotationContainer.$(O) \
+ $(OUTDIR)JavaAnnotationDefault.$(O) \
+ $(OUTDIR)JavaAnnotationDictionary.$(O) \
+ $(OUTDIR)JavaAnnotationValue.$(O) \
+ $(OUTDIR)JavaArray.$(O) \
+ $(OUTDIR)JavaBooleanArray.$(O) \
+ $(OUTDIR)JavaByte.$(O) \
+ $(OUTDIR)JavaByteCodeProcessor.$(O) \
+ $(OUTDIR)JavaClassAccessor.$(O) \
+ $(OUTDIR)JavaClassEnvironment.$(O) \
+ $(OUTDIR)JavaClassQuery.$(O) \
+ $(OUTDIR)JavaClassReloader.$(O) \
+ $(OUTDIR)JavaCodeLibraryOrBundle.$(O) \
+ $(OUTDIR)JavaCompilerForSmalltalkExtensionsOnly.$(O) \
+ $(OUTDIR)JavaCompiler_Eclipse.$(O) \
+ $(OUTDIR)JavaConstantPool.$(O) \
+ $(OUTDIR)JavaConstants.$(O) \
+ $(OUTDIR)JavaContext.$(O) \
+ $(OUTDIR)JavaDecompiler.$(O) \
+ $(OUTDIR)JavaDescriptor.$(O) \
+ $(OUTDIR)JavaError.$(O) \
+ $(OUTDIR)JavaExceptionTable.$(O) \
+ $(OUTDIR)JavaField.$(O) \
+ $(OUTDIR)JavaFinalizationRegistry.$(O) \
+ $(OUTDIR)JavaInnerClasses.$(O) \
+ $(OUTDIR)JavaLanguage.$(O) \
+ $(OUTDIR)JavaLibraries.$(O) \
+ $(OUTDIR)JavaLocalVariableTable.$(O) \
+ $(OUTDIR)JavaLocalVariableTableEntry.$(O) \
+ $(OUTDIR)JavaLookup.$(O) \
+ $(OUTDIR)JavaMetaclass.$(O) \
+ $(OUTDIR)JavaMonitor.$(O) \
+ $(OUTDIR)JavaNameAndType2.$(O) \
+ $(OUTDIR)JavaNativeMemory.$(O) \
+ $(OUTDIR)JavaNioSupport.$(O) \
+ $(OUTDIR)JavaObject.$(O) \
+ $(OUTDIR)JavaObjectDictionary.$(O) \
+ $(OUTDIR)JavaPopUpView.$(O) \
+ $(OUTDIR)JavaProcess.$(O) \
+ $(OUTDIR)JavaRef2.$(O) \
+ $(OUTDIR)JavaRelease.$(O) \
+ $(OUTDIR)JavaResolver.$(O) \
+ $(OUTDIR)JavaShort.$(O) \
+ $(OUTDIR)JavaSocket.$(O) \
+ $(OUTDIR)JavaSourceCodeCache.$(O) \
+ $(OUTDIR)JavaSourceFileWriter.$(O) \
+ $(OUTDIR)JavaTestsLoader.$(O) \
+ $(OUTDIR)JavaTopView.$(O) \
+ $(OUTDIR)JavaUnresolvedCompilationError.$(O) \
+ $(OUTDIR)JavaUnresolvedConstant.$(O) \
+ $(OUTDIR)JavaUtilities.$(O) \
+ $(OUTDIR)JavaVMData.$(O) \
+ $(OUTDIR)JavaView.$(O) \
+ $(OUTDIR)JavaZipDeflater.$(O) \
+ $(OUTDIR)JavaZipFile.$(O) \
+ $(OUTDIR)JavaZipInflater.$(O) \
+ $(OUTDIR)ProxyMethod.$(O) \
+ $(OUTDIR)ProxyMethodCompiler.$(O) \
+ $(OUTDIR)ProxyMethodNode.$(O) \
+ $(OUTDIR)SmalltalkAppletContext.$(O) \
+ $(OUTDIR)SmalltalkAppletStub.$(O) \
+ $(OUTDIR)stx_libjava.$(O) \
+ $(OUTDIR)GroovyMetaclass.$(O) \
+ $(OUTDIR)Java.$(O) \
+ $(OUTDIR)JavaAnnotationArrayValue.$(O) \
+ $(OUTDIR)JavaAnnotationClassValue.$(O) \
+ $(OUTDIR)JavaAnnotationEnumValue.$(O) \
+ $(OUTDIR)JavaAnnotationNestedAnnotationValue.$(O) \
+ $(OUTDIR)JavaAnnotationPrimitiveValue.$(O) \
+ $(OUTDIR)JavaBehavior.$(O) \
+ $(OUTDIR)JavaByteCodeDisassembler.$(O) \
+ $(OUTDIR)JavaByteCodeProcessorAdapter.$(O) \
+ $(OUTDIR)JavaClassAnnotationContainer.$(O) \
+ $(OUTDIR)JavaClassMemberRef2.$(O) \
+ $(OUTDIR)JavaClassReader.$(O) \
+ $(OUTDIR)JavaClassRef2.$(O) \
+ $(OUTDIR)JavaClassRegistry.$(O) \
+ $(OUTDIR)JavaCodeBundle.$(O) \
+ $(OUTDIR)JavaCodeLibrary.$(O) \
+ $(OUTDIR)JavaEmbeddedFrameView.$(O) \
+ $(OUTDIR)JavaFieldAnnotationContainer.$(O) \
+ $(OUTDIR)JavaFieldDescriptor.$(O) \
+ $(OUTDIR)JavaFieldDescriptorWithUnionType.$(O) \
+ $(OUTDIR)JavaInvalidRefError.$(O) \
+ $(OUTDIR)JavaInvokeDynamic2.$(O) \
+ $(OUTDIR)JavaMethod.$(O) \
+ $(OUTDIR)JavaMethodAnnotationContainer.$(O) \
+ $(OUTDIR)JavaMethodDescriptor.$(O) \
+ $(OUTDIR)JavaMethodHandle2.$(O) \
+ $(OUTDIR)JavaMethodType2.$(O) \
+ $(OUTDIR)JavaMirror.$(O) \
+ $(OUTDIR)JavaNativeMethodImpl_OpenJDK6.$(O) \
+ $(OUTDIR)JavaStringRef2.$(O) \
+ $(OUTDIR)JavaUnhandledExceptionError.$(O) \
+ $(OUTDIR)JavaUnhandledThreadDeathError.$(O) \
+ $(OUTDIR)JavaUnresolvedClassConstant.$(O) \
+ $(OUTDIR)JavaUnresolvedStringConstant.$(O) \
+ $(OUTDIR)JavaVM.$(O) \
+ $(OUTDIR)ProxyMethodConditionNode.$(O) \
+ $(OUTDIR)ProxyMethodGuardNode.$(O) \
+ $(OUTDIR)ProxyMethodInvocationNode.$(O) \
+ $(OUTDIR)ProxyMethodJavaFieldAccessor.$(O) \
+ $(OUTDIR)JavaAlienMirror.$(O) \
+ $(OUTDIR)JavaArrayMirror.$(O) \
+ $(OUTDIR)JavaByteCodePreresolver.$(O) \
+ $(OUTDIR)JavaClass.$(O) \
+ $(OUTDIR)JavaClassMirror.$(O) \
+ $(OUTDIR)JavaClassPathBundle.$(O) \
+ $(OUTDIR)JavaFieldRef2.$(O) \
+ $(OUTDIR)JavaMethodAnalyzer.$(O) \
+ $(OUTDIR)JavaMethodRef2.$(O) \
+ $(OUTDIR)JavaMethodWithException.$(O) \
+ $(OUTDIR)JavaNativeMethodImpl_AppleJDK6.$(O) \
+ $(OUTDIR)JavaNativeMethodImpl_OpenJDK7.$(O) \
+ $(OUTDIR)JavaNativeMethodImpl_SunJDK6.$(O) \
+ $(OUTDIR)JavaPrimitiveMirror.$(O) \
+ $(OUTDIR)ProxyMethodAndNode.$(O) \
+ $(OUTDIR)ProxyMethodBlockInvocationNode.$(O) \
+ $(OUTDIR)ProxyMethodJavaFieldGetter.$(O) \
+ $(OUTDIR)ProxyMethodJavaFieldSetter.$(O) \
+ $(OUTDIR)ProxyMethodMethodInvocationNode.$(O) \
+ $(OUTDIR)ProxyMethodTypeCheckNode.$(O) \
+ $(OUTDIR)GroovyClass.$(O) \
+ $(OUTDIR)JavaInterfaceMethodRef2.$(O) \
+ $(OUTDIR)JavaMethodWithHandler.$(O) \
+ $(OUTDIR)JavaNativeMethodImpl_OpenJDK8.$(O) \
+ $(OUTDIR)JavaNativeMethodImpl_OracleJDK7.$(O) \
+ $(OUTDIR)ProxyMethodJavaMethodInvocationNode.$(O) \
+ $(OUTDIR)ProxyMethodJavaTypeCheckNode.$(O) \
+ $(OUTDIR)JavaNativeMethod.$(O) \
+ $(OUTDIR)JavaNativeMethodImpl_OracleJDK8.$(O) \
+ $(OUTDIR)extensions.$(O) \
--- a/bc.mak Mon Jun 05 09:08:54 2017 +0100
+++ b/bc.mak Fri Aug 11 11:34:41 2017 +0100
@@ -33,17 +33,30 @@
MODULE_PATH=libjava
RESFILES=stx_libjavaWINrc.$(RES)
+
+!if defined(USEMINGW32) || defined(USEMINGW64)
+! if defined(USEMINGW32)
+LIBFDM_TARGET = i686-pc-mingw32
+! else
+LIBFDM_TARGET = x86_64-w64-mingw32
+! endif
+LIBFDM=support\fdlibm\$(LIBFDM_TARGET)\libfdm.a
+!else
+LIBFDM=$(LIBFDM_DIR)\fdlibm\libfdm.a
+!endif
+
+
LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libwidg2
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
-LOCALLIBS=$(ZLIB_DIR)\$(ZLIB) support\fdlibm\libfdm.lib
+LOCALLIBS=$(ZLIB_DIR)\$(ZLIB) $(LIBFDM)
OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
-ALL:: $(ZLIB) support\fdlibm\libfdm.lib classLibRule
+ALL:: $(ZLIB) $(LIBFDM) classLibRule
classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
@@ -93,21 +106,15 @@
cd ..\..\libjava
!ifdef USEMINGW64
-support\fdlibm\libfdm.lib:
- cd support\fdlibm
- $(MAKE) -f Makefile.mingw64
- cd ..\..
+$(LIBFDM):
+ set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make -C support\fdlibm OUTDIR=$(LIBFDM_TARGET)
!else
! ifdef USEMINGW32
-support\fdlibm\libfdm.lib:
- cd support\fdlibm
- $(MAKE) -f Makefile.mingw32
- cd ..\..
+$(LIBFDM):
+ set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make -C support\fdlibm OUTDIR=$(LIBFDM_TARGET)
! else
-support\fdlibm\libfdm.lib:
- cd support\fdlibm
- $(MAKE) -f Makefile.bcc
- cd ..\..
+$(LIBFDM):
+ set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make -C support\fdlibm
! endif
!endif
--- a/java/build.common.xml Mon Jun 05 09:08:54 2017 +0100
+++ b/java/build.common.xml Fri Aug 11 11:34:41 2017 +0100
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns:ivy="antlib:org.apache.ivy.ant">
- <property name="ivy.jar" value="${TOP}/libjava/java/ivy-2.3.0.jar"/>
+<project xmlns:ivy="antlib:org.apache.ivy.ant">
+ <property name="ivy.jar" value="${TOP}/libjava/java/ivy-2.4.0.jar"/>
+ <property name="ivy.settings.xml" value="${TOP}/libjava/java/ivy-settings.xml"/>
<property name="build.src.dir" value="src"/>
<property name="build.bin.dir" value="bin"/>
@@ -36,6 +37,10 @@
<pathelement path="${build.bin-tests.dir}"/>
</path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar}" />
+ <ivy:settings file="${ivy.settings.xml}"/>
+
+
<target name="build" depends="compile"/>
@@ -66,8 +71,7 @@
<target name="libs.main">
<mkdir dir="${build.libs.dir}"/>
</target>
- <target name="libs.fetch" if="ivy.dep.file.present">
- <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar}" />
+ <target name="libs.fetch" if="ivy.dep.file.present">
<ivy:retrieve conf="binaries" pattern="${build.libs.dir}/[artifact]-[revision].[ext]" />
<ivy:retrieve conf="sources" pattern="${build.libs-src.dir}/[artifact]-[revision].[ext]" />
</target>
Binary file java/ivy-2.3.0.jar has changed
Binary file java/ivy-2.4.0.jar has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/java/ivy-settings.xml Fri Aug 11 11:34:41 2017 +0100
@@ -0,0 +1,12 @@
+<ivysettings>
+ <properties environment="env"/>
+ <property name="ivy.executor-number" value="${env.EXECUTOR_NUMBER}" override="false" ifset="env.EXECUTOR_NUMBER"/>
+ <property name="ivy.executor-number" value="0" override="false"/>
+ <caches
+ defaultCacheDir="${ivy.default.ivy.user.dir}/caches/${ivy.executor-number}/default"
+ resolutionCacheDir="${ivy.default.ivy.user.dir}/caches/${ivy.executor-number}/resolution"
+ />
+ <settings defaultResolver="default"/>
+ <include url="${ivy.default.settings.dir}/ivysettings.xml"/>
+ <lock-strategies>artifact-lock-nio</lock-strategies>
+</ivysettings>
\ No newline at end of file
--- a/libs/java/build.ivy.xml Mon Jun 05 09:08:54 2017 +0100
+++ b/libs/java/build.ivy.xml Fri Aug 11 11:34:41 2017 +0100
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse.ant.import?>
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="stx.libjava.tools.dependencies" default="dependencies">
- <property name="ivy.jar" value="../../java/ivy-2.3.0.jar"/>
- <target name="dependencies" description="Download required libraries">
- <taskdef
- resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
- classpath="${ivy.jar}"/>
+ <property name="ivy.jar" value="../../java/ivy-2.4.0.jar"/>
+ <property name="ivy.settings.xml" value="../../java/ivy-settings.xml"/>
+
+ <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar}"/>
+ <ivy:settings file="${ivy.settings.xml}"/>
+
+ <target name="dependencies" description="Download required libraries">
<ivy:retrieve
conf="binaries"
pattern="libs/[artifact]-[revision].[ext]"/>
--- a/stx_libjava.st Mon Jun 05 09:08:54 2017 +0100
+++ b/stx_libjava.st Fri Aug 11 11:34:41 2017 +0100
@@ -178,18 +178,57 @@
!stx_libjava class methodsFor:'description - compilation'!
+additionalDefinitions_bc_dot_mak
+ ^ '
+!!if defined(USEMINGW32) || defined(USEMINGW64)
+!! if defined(USEMINGW32)
+LIBFDM_TARGET = i686-pc-mingw32
+!! else
+LIBFDM_TARGET = x86_64-w64-mingw32
+!! endif
+LIBFDM=support\fdlibm\$(LIBFDM_TARGET)\libfdm.a
+!!else
+LIBFDM=$(LIBFDM_DIR)\fdlibm\libfdm.a
+!!endif
+
+
+'
+
+ "Created: / 22-08-2006 / 23:58:05 / cg"
+ "Modified: / 19-07-2017 / 00:44:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+additionalDefinitions_make_dot_proto
+ ^ '
+ifdef BUILD_TARGET
+LIBFDM_TARGET=$(BUILD_TARGET)
+else
+ifeq ($(CONF),config-linux-x86_64)
+LIBFDM_TARGET=x86_64-pc-linux-gnu
+else ifeq ($(CONF),config-linux-i386)
+LIBFDM_TARGET=i686-pc-linux-gnu
+endif
+endif
+LIBFDM=support/fdlibm/$(LIBFDM_TARGET)/libfdm.a
+
+
+'
+
+ "Created: / 19-07-2017 / 08:13:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
additionalLinkLibraries_bc_dot_mak
- ^ '$(ZLIB_DIR)\$(ZLIB) support\fdlibm\libfdm.lib'
+ ^ '$(ZLIB_DIR)\$(ZLIB) $(LIBFDM)'
- "Modified: / 07-09-2011 / 17:04:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2017 / 00:44:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalLinkLibraries_make_dot_proto
- ^ '$(ZLIB_LD_ARG) support/fdlibm/libfdm.a'
+ ^ '$(ZLIB_LD_ARG) $(LIBFDM)'
- "Modified: / 07-09-2011 / 17:01:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2017 / 08:13:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalRules_bc_dot_mak
@@ -216,26 +255,20 @@
cd ..\..\libjava
!!ifdef USEMINGW64
-support\fdlibm\libfdm.lib:
- cd support\fdlibm
- $(MAKE) -f Makefile.mingw64
- cd ..\..
+$(LIBFDM):
+ set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make -C support\fdlibm OUTDIR=$(LIBFDM_TARGET)
!!else
!! ifdef USEMINGW32
-support\fdlibm\libfdm.lib:
- cd support\fdlibm
- $(MAKE) -f Makefile.mingw32
- cd ..\..
+$(LIBFDM):
+ set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make -C support\fdlibm OUTDIR=$(LIBFDM_TARGET)
!! else
-support\fdlibm\libfdm.lib:
- cd support\fdlibm
- $(MAKE) -f Makefile.bcc
- cd ..\..
+$(LIBFDM):
+ set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make -C support\fdlibm
!! endif
!!endif
'
- "Modified: / 11-09-2015 / 16:16:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2017 / 00:49:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalRules_make_dot_proto
@@ -253,29 +286,29 @@
zlib:
cd $(ZLIB_DIR); $(MAKE) $(MAKE_ZLIB_ARG)
-support/fdlibm/libfdm.a:
- $(MAKE) CCCONFOPT="$(CCCONFOPT) -fPIC" -C support/fdlibm
+$(LIBFDM):
+ $(MAKE) CCCONFOPT="$(CCCONFOPT) -fPIC" OUTDIR=$(LIBFDM_TARGET) -C support/fdlibm
clean::
- $(MAKE) -C support/fdlibm clean
+ $(MAKE) -C OUTDIR=$(LIBFDM_TARGET) support/fdlibm clean
'
- "Modified: / 04-02-2015 / 06:51:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2017 / 08:14:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalTargets_bc_dot_mak
- ^ '$(ZLIB) support\fdlibm\libfdm.lib'
+ ^ '$(ZLIB) $(LIBFDM)'
- "Modified: / 04-02-2015 / 06:51:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2017 / 00:50:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalTargets_make_dot_proto
- ^ ' zlib support/fdlibm/libfdm.a'
+ ^ ' zlib $(LIBFDM)'
"Created: / 05-09-2006 / 16:05:12 / cg"
- "Modified: / 04-02-2015 / 06:50:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2017 / 08:15:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
localIncludes
@@ -438,34 +471,34 @@
JavaNativeMethod
#'JavaNativeMethodImpl_OracleJDK8'
(GroovyEvaluatorTests autoload)
- (JUnitTestCaseProxy autoload)
(JavaAntProjectResource autoload)
- (JavaByteCodeDisassemblerTests autoload)
(JavaByteCodeProcessorTests autoload)
(JavaClassLoadingTests autoload)
- (JavaClassReaderTests autoload)
- (JavaClassRefTests autoload)
(JavaClassReloaderTests autoload)
(JavaExceptionTests autoload)
- (JavaFieldRefTests autoload)
(JavaFreshlyInitializedResource autoload)
(JavaInitializedResource autoload)
- (JavaInterfaceMethodRefTests autoload)
(JavaJUnitTests autoload)
(JavaLibrariesResource autoload)
(JavaLookupResolutionAlgorithmTests autoload)
(JavaLookupTests autoload)
- (JavaMethodRefTests autoload)
(JavaMonitorsTests autoload)
(JavaNativeMemoryTests autoload)
- (JavaRefMock autoload)
(JavaRefsAndConstantPoolTestCase autoload)
(JavaReleaseTests autoload)
- (JavaRuntimeConstantPoolTests autoload)
(JavaTestCaseProxy autoload)
- (JavaTestsResource autoload)
(JavaThreadingTests autoload)
(JavaUTF8Tests autoload)
+ (JUnitTestCaseProxy autoload)
+ (JavaByteCodeDisassemblerTests autoload)
+ (JavaClassReaderTests autoload)
+ (JavaClassRefTests autoload)
+ (JavaFieldRefTests autoload)
+ (JavaInterfaceMethodRefTests autoload)
+ (JavaMethodRefTests autoload)
+ (JavaRefMock autoload)
+ (JavaRuntimeConstantPoolTests autoload)
+ (JavaTestsResource autoload)
(TestletTestCaseProxy autoload)
)
!
--- a/support/fdlibm/Makefile Mon Jun 05 09:08:54 2017 +0100
+++ b/support/fdlibm/Makefile Fri Aug 11 11:34:41 2017 +0100
@@ -47,6 +47,8 @@
prefix = /usr/local
+OUTDIR ?= .
+
AR = ar
CC = gcc
@@ -64,7 +66,7 @@
LDFLAGS =
-LIB = libfdm.a
+LIB = $(OUTDIR)/libfdm.a
LIBS =
@@ -97,26 +99,26 @@
s_rint.c s_scalbn.c s_signgam.c s_significand.c s_sin.c \
s_tan.c s_tanh.c
-obj = k_standard.o k_rem_pio2.o \
- k_cos.o k_sin.o k_tan.o \
- e_acos.o e_acosh.o e_asin.o e_atan2.o \
- e_atanh.o e_cosh.o e_exp.o e_fmod.o \
- e_gamma.o e_gamma_r.o e_hypot.o e_j0.o \
- e_j1.o e_jn.o e_lgamma.o e_lgamma_r.o \
- e_log.o e_log10.o e_pow.o e_rem_pio2.o e_remainder.o \
- e_scalb.o e_sinh.o e_sqrt.o \
- w_acos.o w_acosh.o w_asin.o w_atan2.o \
- w_atanh.o w_cosh.o w_exp.o w_fmod.o \
- w_gamma.o w_gamma_r.o w_hypot.o w_j0.o \
- w_j1.o w_jn.o w_lgamma.o w_lgamma_r.o \
- w_log.o w_log10.o w_pow.o w_remainder.o \
- w_scalb.o w_sinh.o w_sqrt.o \
- s_asinh.o s_atan.o s_cbrt.o s_ceil.o s_copysign.o \
- s_cos.o s_erf.o s_expm1.o s_fabs.o s_finite.o s_floor.o \
- s_frexp.o s_ilogb.o s_isnan.o s_ldexp.o s_lib_version.o \
- s_log1p.o s_logb.o s_matherr.o s_modf.o s_nextafter.o \
- s_rint.o s_scalbn.o s_signgam.o s_significand.o s_sin.o \
- s_tan.o s_tanh.o
+obj = $(OUTDIR)/k_standard.o $(OUTDIR)/k_rem_pio2.o \
+ $(OUTDIR)/k_cos.o $(OUTDIR)/k_sin.o $(OUTDIR)/k_tan.o \
+ $(OUTDIR)/e_acos.o $(OUTDIR)/e_acosh.o $(OUTDIR)/e_asin.o $(OUTDIR)/e_atan2.o \
+ $(OUTDIR)/e_atanh.o $(OUTDIR)/e_cosh.o $(OUTDIR)/e_exp.o $(OUTDIR)/e_fmod.o \
+ $(OUTDIR)/e_gamma.o $(OUTDIR)/e_gamma_r.o $(OUTDIR)/e_hypot.o $(OUTDIR)/e_j0.o \
+ $(OUTDIR)/e_j1.o $(OUTDIR)/e_jn.o $(OUTDIR)/e_lgamma.o $(OUTDIR)/e_lgamma_r.o \
+ $(OUTDIR)/e_log.o $(OUTDIR)/e_log10.o $(OUTDIR)/e_pow.o $(OUTDIR)/e_rem_pio2.o $(OUTDIR)/e_remainder.o \
+ $(OUTDIR)/e_scalb.o $(OUTDIR)/e_sinh.o $(OUTDIR)/e_sqrt.o \
+ $(OUTDIR)/w_acos.o $(OUTDIR)/w_acosh.o $(OUTDIR)/w_asin.o $(OUTDIR)/w_atan2.o \
+ $(OUTDIR)/w_atanh.o $(OUTDIR)/w_cosh.o $(OUTDIR)/w_exp.o $(OUTDIR)/w_fmod.o \
+ $(OUTDIR)/w_gamma.o $(OUTDIR)/w_gamma_r.o $(OUTDIR)/w_hypot.o $(OUTDIR)/w_j0.o \
+ $(OUTDIR)/w_j1.o $(OUTDIR)/w_jn.o $(OUTDIR)/w_lgamma.o $(OUTDIR)/w_lgamma_r.o \
+ $(OUTDIR)/w_log.o $(OUTDIR)/w_log10.o $(OUTDIR)/w_pow.o $(OUTDIR)/w_remainder.o \
+ $(OUTDIR)/w_scalb.o $(OUTDIR)/w_sinh.o $(OUTDIR)/w_sqrt.o \
+ $(OUTDIR)/s_asinh.o $(OUTDIR)/s_atan.o $(OUTDIR)/s_cbrt.o $(OUTDIR)/s_ceil.o $(OUTDIR)/s_copysign.o \
+ $(OUTDIR)/s_cos.o $(OUTDIR)/s_erf.o $(OUTDIR)/s_expm1.o $(OUTDIR)/s_fabs.o $(OUTDIR)/s_finite.o $(OUTDIR)/s_floor.o \
+ $(OUTDIR)/s_frexp.o $(OUTDIR)/s_ilogb.o $(OUTDIR)/s_isnan.o $(OUTDIR)/s_ldexp.o $(OUTDIR)/s_lib_version.o \
+ $(OUTDIR)/s_log1p.o $(OUTDIR)/s_logb.o $(OUTDIR)/s_matherr.o $(OUTDIR)/s_modf.o $(OUTDIR)/s_nextafter.o \
+ $(OUTDIR)/s_rint.o $(OUTDIR)/s_scalbn.o $(OUTDIR)/s_signgam.o $(OUTDIR)/s_significand.o $(OUTDIR)/s_sin.o \
+ $(OUTDIR)/s_tan.o $(OUTDIR)/s_tanh.o
all: $(LIB)
@@ -124,7 +126,7 @@
@echo This package does not have a validation suite.
clean:
- -$(RM) *~ \#* core a.out *.o $(LIB)
+ -$(RM) *~ \#* core a.out $(obj) $(LIB)
distclean: mostlyclean
-$(RM) $(LIB)
@@ -134,7 +136,7 @@
$(CHMOD) 664 $(prefix)/lib/$(LIB)
$(RANLIB) $(prefix)/lib/$(LIB) || true
-$(LIB) : $(obj)
+$(LIB) : $(OUTDIR) $(obj)
$(AR) cru $(LIB) $(obj)
$(RANLIB) $(LIB) || true
@@ -151,3 +153,10 @@
uninstall:
-$(RM) $(prefix)/lib/$(LIB)
-$(RM) $(prefix)/lib/$(LIB)
+
+
+$(OUTDIR):
+ mkdir $(OUTDIR)
+
+$(OUTDIR)/%.o: %.c
+ $(CC) $(CFLAGS) -c -o $@ $<
--- a/tools/JavaLintService.st Mon Jun 05 09:08:54 2017 +0100
+++ b/tools/JavaLintService.st Fri Aug 11 11:34:41 2017 +0100
@@ -36,33 +36,6 @@
"
! !
-!JavaLintService class methodsFor:'initialization'!
-
-initialize
-
- "
- | map |
- map := Screen current keyboardMap.
- map bindValue:#CodeCompletion to: #'Ctrl '.
- map bindValue:#CodeCompletion to: #'Ctrlspace'.
- "
-
- Smalltalk isInitialized ifTrue:[
- Smalltalk addStartBlock:[
- Screen current notNil ifTrue:[
- | map |
- map := Screen current keyboardMap.
- (map keyAtValue:#CodeCompletion) isNil ifTrue:[
- map bindValue:#CodeCompletion to: #'Ctrl '.
- map bindValue:#CodeCompletion to: #'Ctrlspace'.
- ].
- ]
- ]
- ]
-
- "Modified: / 15-08-2013 / 15:19:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
!JavaLintService class methodsFor:'accessing'!
debugging