You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2020/09/24 19:23:16 UTC
[netbeans] branch master updated: [NETBEANS-4305] - cleanup dead
hardware support
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 681301e [NETBEANS-4305] - cleanup dead hardware support
new 5743f22 Merge pull request #2131 from BradWalker/remove_solaris_platform
681301e is described below
commit 681301ee4cb9c989f2fac79e28cfdd7b3b5138bd
Author: Brad Walker <bw...@musings.com>
AuthorDate: Mon May 4 23:09:28 2020 -0600
[NETBEANS-4305] - cleanup dead hardware support
Sun Microsystems has not produced a 32-bit microprocessor in years. In addition, Solaris is
now strictly 64-bit and has been that way for a LONG time.
So cleanup the platform support to remove support for 32-bit SPARC processors and Solaris.
Java doesn't even run on this equipment!
---
.../nbproject/project.properties | 8 ---
ide/dlight.nativeexecution/tools/Makefile | 1 -
.../tools/build-pty-support.sh | 1 -
ide/dlight.nativeexecution/tools/killall/Makefile | 13 ++---
ide/dlight.nativeexecution/tools/pty/Makefile | 1 -
ide/dlight.nativeexecution/tools/unbuffer/Makefile | 2 -
.../installer/utils/system/SolarisNativeUtils.java | 11 +----
nbi/infra/build/jvm/build.xml | 7 ---
.../build/jvm/tools/unzipsfx/solaris-sparc/LICENSE | 49 -------------------
.../libsrc/org/netbeans/updater/UpdaterFrame.java | 33 -------------
.../common/integration/IntegrationUtils.java | 18 ++-----
.../native/build/buildnative-solaris.sh | 57 ----------------------
.../release/remote-pack-defs/build.xml | 9 +---
.../remote-pack-defs/profile-solsparc-15.sh | 34 -------------
.../remote-pack-defs/profile-solsparc-16.sh | 34 -------------
.../profiler/attach/dialog/AttachDialog.java | 1 -
.../attach/spi/AbstractRemotePackExporter.java | 1 -
17 files changed, 11 insertions(+), 269 deletions(-)
diff --git a/ide/dlight.nativeexecution/nbproject/project.properties b/ide/dlight.nativeexecution/nbproject/project.properties
index 41a0bd1..ec6bcf2 100644
--- a/ide/dlight.nativeexecution/nbproject/project.properties
+++ b/ide/dlight.nativeexecution/nbproject/project.properties
@@ -85,14 +85,6 @@ release.external/exechlp-1.0.zip!/MacOSX-x86_64/pty_open = bin/nativeexec
release.external/exechlp-1.0.zip!/MacOSX-x86_64/stat = bin/nativeexecution/MacOSX-x86_64/stat
release.external/exechlp-1.0.zip!/MacOSX-x86_64/unbuffer.dylib = bin/nativeexecution/MacOSX-x86_64/unbuffer.dylib
release.external/exechlp-1.0.zip!/MacOSX-x86_64/killall = bin/nativeexecution/MacOSX-x86_64/killall
-release.external/exechlp-1.0.zip!/SunOS-sparc/privp = bin/nativeexecution/SunOS-sparc/privp
-release.external/exechlp-1.0.zip!/SunOS-sparc/process_start = bin/nativeexecution/SunOS-sparc/process_start
-release.external/exechlp-1.0.zip!/SunOS-sparc/pty = bin/nativeexecution/SunOS-sparc/pty
-release.external/exechlp-1.0.zip!/SunOS-sparc/pty_open = bin/nativeexecution/SunOS-sparc/pty_open
-release.external/exechlp-1.0.zip!/SunOS-sparc/sigqueue = bin/nativeexecution/SunOS-sparc/sigqueue
-release.external/exechlp-1.0.zip!/SunOS-sparc/stat = bin/nativeexecution/SunOS-sparc/stat
-release.external/exechlp-1.0.zip!/SunOS-sparc/unbuffer.so = bin/nativeexecution/SunOS-sparc/unbuffer.so
-release.external/exechlp-1.0.zip!/SunOS-sparc/killall = bin/nativeexecution/SunOS-sparc/killall
release.external/exechlp-1.0.zip!/SunOS-sparc_64/privp = bin/nativeexecution/SunOS-sparc_64/privp
release.external/exechlp-1.0.zip!/SunOS-sparc_64/process_start = bin/nativeexecution/SunOS-sparc_64/process_start
release.external/exechlp-1.0.zip!/SunOS-sparc_64/pty = bin/nativeexecution/SunOS-sparc_64/pty
diff --git a/ide/dlight.nativeexecution/tools/Makefile b/ide/dlight.nativeexecution/tools/Makefile
index 230d945..0796cbd 100644
--- a/ide/dlight.nativeexecution/tools/Makefile
+++ b/ide/dlight.nativeexecution/tools/Makefile
@@ -33,7 +33,6 @@ CF_Linux-sparc_64 = -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -m64
CF_Linux-arm = -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -std=c99
CF_MacOSX-x86 = -DMAXOSX -D_DARWIN_C_SOURCE -m32
CF_MacOSX-x86_64 = -DMAXOSX -D_DARWIN_C_SOURCE -m64
-CF_SunOS-sparc = -DSOLARIS -D__EXTENSIONS__ -m32
CF_SunOS-sparc_64 = -DSOLARIS -D__EXTENSIONS__ -m64
CF_SunOS-x86 = -DSOLARIS -m32
CF_SunOS-x86_64 = -DSOLARIS -m64
diff --git a/ide/dlight.nativeexecution/tools/build-pty-support.sh b/ide/dlight.nativeexecution/tools/build-pty-support.sh
index ac4609d..2e4bffc 100755
--- a/ide/dlight.nativeexecution/tools/build-pty-support.sh
+++ b/ide/dlight.nativeexecution/tools/build-pty-support.sh
@@ -82,7 +82,6 @@ copy_to_release() {
cp ${LWDIR}/Linux_x86/GNU-Linux-x86/ptysupport ../release/bin/nativeexecution/Linux-x86/pty
cp ${LWDIR}/Linux_x64/GNU-Linux-x86/ptysupport ../release/bin/nativeexecution/Linux-x86_64/pty
cp ${LWDIR}/Linux_sparc64/GNU-Linux-Sparc/ptysupport ../release/bin/nativeexecution/Linux-sparc_64/pty
- cp ${LWDIR}/Solaris_sparc/GNU-Solaris-Sparc/ptysupport ../release/bin/nativeexecution/SunOS-sparc/pty
cp ${LWDIR}/Solaris_sparc64/GNU-Solaris-Sparc/ptysupport ../release/bin/nativeexecution/SunOS-sparc_64/pty
# Only 32-bit version for Windows...
cp ${LWDIR}/Windows_x86/Cygwin-Windows/ptysupport.exe ../release/bin/nativeexecution/Windows-x86/pty
diff --git a/ide/dlight.nativeexecution/tools/killall/Makefile b/ide/dlight.nativeexecution/tools/killall/Makefile
index 0a7385a..fde9873 100644
--- a/ide/dlight.nativeexecution/tools/killall/Makefile
+++ b/ide/dlight.nativeexecution/tools/killall/Makefile
@@ -27,14 +27,10 @@ ARCH:sh = arch
ifeq (armv, $(shell expr substr `arch` 1 4))
OS_ARCH = $(OS)-arm
else
- ifeq (sun4, $(ARCH))
+ ifeq (sparc64, $(ARCH))
OS_ARCH = $(OS)-sparc
- else
- ifeq (sparc64, $(ARCH))
- OS_ARCH = $(OS)-sparc
- else
- OS_ARCH = $(OS)-x86
- endif
+ else
+ OS_ARCH = $(OS)-x86
endif
endif
@@ -53,7 +49,6 @@ SOURCES_Mac=\
SOURCES_SunOS-x86=$(SOURCES_SunOS)
SOURCES_SunOS-x86_64=$(SOURCES_SunOS)
-SOURCES_SunOS-sparc=$(SOURCES_SunOS)
SOURCES_SunOS-sparc_64=$(SOURCES_SunOS)
SOURCES_Linux-x86=$(SOURCES_Linux)
SOURCES_Linux-arm=$(SOURCES_Linux)
@@ -85,7 +80,6 @@ EXEC=$(DIST_DIR)/$(PNAME)
CF_Linux-x86 = $(CF_COMMON) -DLINUX -m32
CF_Linux-arm = $(CF_COMMON) -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -std=c99
CF_MacOSX-x86 = $(CF_COMMON) -DMACOSX -D_DARWIN_C_SOURCE -m32
-CF_SunOS-sparc = $(CF_COMMON) -DSOLARIS -D__EXTENSIONS__ -m32
CF_SunOS-x86 = $(CF_COMMON) -DSOLARIS -D__EXTENSIONS__ -m32
CF_Windows-x86 = $(CF_COMMON) -DWINDOWS -m32
@@ -100,7 +94,6 @@ LF_Windows-x86 = --static-libgcc
LF_Windows-x86_64 = --static-libgcc
LF_SunOS-x86 = -lrt
LF_SunOS-x86_64 = -lrt
-LF_SunOS-sparc = -lrt
LF_SunOS-sparc_64 = -lrt
CFLAGS=$(CF_$(CONF)) $(CFLAGS_EXTRA)
diff --git a/ide/dlight.nativeexecution/tools/pty/Makefile b/ide/dlight.nativeexecution/tools/pty/Makefile
index 71e5eac..83d8bd8 100644
--- a/ide/dlight.nativeexecution/tools/pty/Makefile
+++ b/ide/dlight.nativeexecution/tools/pty/Makefile
@@ -53,7 +53,6 @@ CF_Linux-sparc_64 = $(CF_COMMON) -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -m6
CF_Linux-arm = $(CF_COMMON) -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -std=c99
CF_MacOSX-x86 = $(CF_COMMON) -DMAXOSX -D_DARWIN_C_SOURCE -m32
CF_MacOSX-x86_64 = $(CF_COMMON) -DMAXOSX -D_DARWIN_C_SOURCE -m64
-CF_SunOS-sparc = $(CF_COMMON) -DSOLARIS -D__EXTENSIONS__ -m32
CF_SunOS-sparc_64 = $(CF_COMMON) -DSOLARIS -D__EXTENSIONS__ -m64
CF_SunOS-x86 = $(CF_COMMON) -DSOLARIS -D__EXTENSIONS__ -m32
CF_SunOS-x86_64 = $(CF_COMMON) -DSOLARIS -D__EXTENSIONS__ -m64
diff --git a/ide/dlight.nativeexecution/tools/unbuffer/Makefile b/ide/dlight.nativeexecution/tools/unbuffer/Makefile
index f3f9906..b7c028e 100644
--- a/ide/dlight.nativeexecution/tools/unbuffer/Makefile
+++ b/ide/dlight.nativeexecution/tools/unbuffer/Makefile
@@ -46,8 +46,6 @@ CF_MacOSX-x86 = $(CF_COMMON) -DMAXOSX -shared -m32
EX_MacOSX-x86 = unbuffer.dylib
CF_MacOSX-x86_64 = $(CF_COMMON) -DMAXOSX -shared -m64
EX_MacOSX-x86_64 = unbuffer.dylib
-CF_SunOS-sparc = $(CF_COMMON) -DSOLARIS -G -fPIC -m32
-EX_SunOS-sparc = unbuffer.so
CF_SunOS-sparc_64 = $(CF_COMMON) -DSOLARIS -G -fPIC -m64
EX_SunOS-sparc_64 = unbuffer.so
CF_SunOS-x86 = $(CF_COMMON) -DSOLARIS -G -fPIC -m32
diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/SolarisNativeUtils.java b/nbi/engine/src/org/netbeans/installer/utils/system/SolarisNativeUtils.java
index 461e988..be28e9b 100644
--- a/nbi/engine/src/org/netbeans/installer/utils/system/SolarisNativeUtils.java
+++ b/nbi/engine/src/org/netbeans/installer/utils/system/SolarisNativeUtils.java
@@ -28,11 +28,6 @@ import org.netbeans.installer.utils.helper.Platform;
*/
public class SolarisNativeUtils extends UnixNativeUtils {
- public static final String LIBRARY_PATH_SOLARIS_SPARC =
- NATIVE_JNILIB_RESOURCE_SUFFIX +
- "solaris-sparc/" + //NOI18N
- "solaris-sparc.so"; //NOI18N
-
public static final String LIBRARY_PATH_SOLARIS_SPARCV9 =
NATIVE_JNILIB_RESOURCE_SUFFIX +
"solaris-sparc/" + //NOI18N
@@ -68,10 +63,8 @@ public class SolarisNativeUtils extends UnixNativeUtils {
SolarisNativeUtils() {
String library = null;
- if(System.getProperty("os.arch").contains("sparc")) {
- library = SystemUtils.isCurrentJava64Bit() ?
- LIBRARY_PATH_SOLARIS_SPARCV9 :
- LIBRARY_PATH_SOLARIS_SPARC;
+ if (System.getProperty("os.arch").contains("sparc")) {
+ library = LIBRARY_PATH_SOLARIS_SPARCV9;
} else {
library = SystemUtils.isCurrentJava64Bit() ?
LIBRARY_PATH_SOLARIS_X64 :
diff --git a/nbi/infra/build/jvm/build.xml b/nbi/infra/build/jvm/build.xml
index 7b710f9..721c12d 100644
--- a/nbi/infra/build/jvm/build.xml
+++ b/nbi/infra/build/jvm/build.xml
@@ -227,12 +227,6 @@
<os arch="amd64"/>
</and>
</condition>
- <condition property="jvm.platform" value="solaris-sparc">
- <and>
- <equals arg1="${os.name}" arg2="SunOS"/>
- <os arch="sparc"/>
- </and>
- </condition>
<condition property="jvm.platform" value="solaris-sparcv9">
<and>
<equals arg1="${os.name}" arg2="SunOS"/>
@@ -274,7 +268,6 @@
<condition property="make-shared-classed">
<or>
<equals arg1="${jvm.platform}" arg2="solaris-i586"/>
- <equals arg1="${jvm.platform}" arg2="solaris-sparc"/>
<equals arg1="${jvm.platform}" arg2="linux-i586"/>
<equals arg1="${jvm.platform}" arg2="windows-i586"/>
</or>
diff --git a/nbi/infra/build/jvm/tools/unzipsfx/solaris-sparc/LICENSE b/nbi/infra/build/jvm/tools/unzipsfx/solaris-sparc/LICENSE
deleted file mode 100644
index 8511cdb..0000000
--- a/nbi/infra/build/jvm/tools/unzipsfx/solaris-sparc/LICENSE
+++ /dev/null
@@ -1,49 +0,0 @@
-This is version 2000-Apr-09 of the Info-ZIP copyright and license.
-The definitive version of this document should be available at
-ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely.
-
-
-Copyright (c) 1990-2000 Info-ZIP. All rights reserved.
-
-For the purposes of this copyright and license, "Info-ZIP" is defined as
-the following set of individuals:
-
- Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
- Jean-loup Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase,
- Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, David Kirschbaum,
- Johnny Lee, Onno van der Linden, Igor Mandrichenko, Steve P. Miller,
- Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, Kai Uwe Rommel,
- Steve Salisbury, Dave Smith, Christian Spieler, Antoine Verheijen,
- Paul von Behren, Rich Wales, Mike White
-
-This software is provided "as is," without warranty of any kind, express
-or implied. In no event shall Info-ZIP or its contributors be held liable
-for any direct, indirect, incidental, special or consequential damages
-arising out of the use of or inability to use this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
- 1. Redistributions of source code must retain the above copyright notice,
- definition, disclaimer, and this list of conditions.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, definition, disclaimer, and this list of conditions in
- documentation and/or other materials provided with the distribution.
-
- 3. Altered versions--including, but not limited to, ports to new operating
- systems, existing ports with new graphical interfaces, and dynamic,
- shared, or static library versions--must be plainly marked as such
- and must not be misrepresented as being the original source. Such
- altered versions also must not be misrepresented as being Info-ZIP
- releases--including, but not limited to, labeling of the altered
- versions with the names "Info-ZIP" (or any variation thereof, including,
- but not limited to, different capitalizations), "Pocket UnZip," "WiZ"
- or "MacZip" without the explicit permission of Info-ZIP. Such altered
- versions are further prohibited from misrepresentative use of the
- Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s).
-
- 4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
- "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its own source and
- binary releases.
diff --git a/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java b/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java
index c1c8eb2..e202a9b 100644
--- a/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java
+++ b/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java
@@ -66,18 +66,6 @@ implements UpdatingContext {
XMLUtil.LOG.info("Entering updater.jar .................................................................... ");
}
-
- /** Operating system is Windows x */
- public static final int OS_WIN = 1;
- /** Operating system is Solaris. */
- public static final int OS_SOLARIS = 8;
- /** Operating system is Linux. */
- public static final int OS_LINUX = 16;
- /** Operating system is OS/2. */
- public static final int OS_OS2 = 1024;
- /** Operating system is unknown. */
- public static final int OS_OTHER = 65536;
-
private static final String SPLASH_PATH = "org/netbeans/updater/resources/updatersplash"; // NOI18N
private static final String[] ICONS_PATHS = {"org/netbeans/updater/resources/frame",
"org/netbeans/updater/resources/frame32",
@@ -311,27 +299,6 @@ implements UpdatingContext {
});
}
- /** Get the operating system on which the IDE is running.
- * @return one of the <code>OS_*</code> constants (such as {@link #OS_WINNT})
- */
- private static int getOperatingSystem () {
- int operatingSystem;
- String osName = System.getProperty ("os.name");
- if ( osName != null && osName.startsWith("Windows")) // NOI18N
- operatingSystem = OS_WIN;
- else if ("Solaris".equals (osName)) // NOI18N
- operatingSystem = OS_SOLARIS;
- else if (osName.startsWith ("SunOS")) // NOI18N
- operatingSystem = OS_SOLARIS;
- else if ("Linux".equals (osName)) // NOI18N
- operatingSystem = OS_LINUX;
- else if ("OS/2".equals (osName)) // NOI18N
- operatingSystem = OS_OS2;
- else
- operatingSystem = OS_OTHER;
- return operatingSystem;
- }
-
@Override
public boolean isFromIDE() {
return false;
diff --git a/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java
index ebc0bf4..a4e0ee0 100644
--- a/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java
+++ b/profiler/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java
@@ -60,8 +60,8 @@ public class IntegrationUtils {
public static final String PLATFORM_LINUX_CVM = messages.getString("IntegrationUtils_PlatformLinuxCvm"); // NOI18N
public static final String PLATFORM_SOLARIS_INTEL_OS = messages.getString("IntegrationUtils_PlatformSolarisIntelOs"); // NOI18N
public static final String PLATFORM_SOLARIS_AMD64_OS = messages.getString("IntegrationUtils_PlatformSolarisAmd64Os"); // NOI18N
- public static final String PLATFORM_SOLARIS_SPARC_OS = messages.getString("IntegrationUtils_PlatformSolarisSparcOs"); // NOI18N
public static final String PLATFORM_SOLARIS_SPARC64_OS = messages.getString("IntegrationUtils_PlatformSolarisSparc64Os"); // NOI18N
+ public static final String PLATFORM_SOLARIS_SPARC_OS = messages.getString("IntegrationUtils_PlatformSolarisSparcOs"); // NOI18N
public static final String PLATFORM_MAC_OS = messages.getString("IntegrationUtils_PlatformMacOs"); // NOI18N
public static final String MODIFIED_FOR_PROFILER_STRING = messages.getString("IntegrationUtils_ModifiedForProfilerString"); // NOI18N
public static final String ORIGINAL_BACKUP_LOCATION_STRING = messages.getString("IntegrationUtils_OriginalBackupLocationString"); // NOI18N
@@ -270,12 +270,6 @@ public class IntegrationUtils {
}
} else if ((Platform.OS_WINDOWS_MASK & platform) != 0) {
return PLATFORM_WINDOWS_OS;
- } else if (platform == Platform.OS_SOLARIS) {
- if (arch.startsWith("x86")) { //NOI18N
- return PLATFORM_SOLARIS_INTEL_OS;
- } else {
- return PLATFORM_SOLARIS_SPARC_OS;
- }
} else {
throw new UnsupportedOperationException(); //Mac32, Unknown
}
@@ -397,13 +391,13 @@ public class IntegrationUtils {
return PLATFORM_LINUX_OS;
} else if (Platform.isSolarisIntel()) {
return PLATFORM_SOLARIS_INTEL_OS;
- } else if (Platform.isSolarisSparc()) {
- return PLATFORM_SOLARIS_SPARC_OS;
} else if (Platform.isMac()) {
return PLATFORM_MAC_OS;
}
- return PLATFORM_SOLARIS_SPARC_OS; // Not supported platform => assume UNIX
+ // We have an unsupported platform at this point..
+ // So assume it is UNIX-like..
+ return PLATFORM_LINUX_OS;
} else {
if (Platform.isWindows()) {
return PLATFORM_WINDOWS_AMD64_OS;
@@ -469,8 +463,6 @@ public class IntegrationUtils {
return "solaris-i386"; //NOI18N
} else if (targetPlatform.equals(PLATFORM_SOLARIS_AMD64_OS)) {
return "solaris-amd64"; //NOI18N
- } else if (targetPlatform.equals(PLATFORM_SOLARIS_SPARC_OS)) {
- return "solaris-sparc"; //NOI18N
} else if (targetPlatform.equals(PLATFORM_SOLARIS_SPARC64_OS)) {
return "solaris-sparcv9"; //NOI18N
} else if (targetPlatform.equals(PLATFORM_MAC_OS)) {
@@ -646,7 +638,7 @@ public class IntegrationUtils {
public static boolean isSolarisPlatform(String targetPlatform) {
return targetPlatform.equals(PLATFORM_SOLARIS_AMD64_OS) || targetPlatform.equals(PLATFORM_SOLARIS_INTEL_OS)
- || targetPlatform.equals(PLATFORM_SOLARIS_SPARC64_OS) || targetPlatform.equals(PLATFORM_SOLARIS_SPARC_OS);
+ || targetPlatform.equals(PLATFORM_SOLARIS_SPARC64_OS);
}
public static boolean isMacPlatform(String targetPlatform) {
diff --git a/profiler/lib.profiler/native/build/buildnative-solaris.sh b/profiler/lib.profiler/native/build/buildnative-solaris.sh
deleted file mode 100755
index 182a6e7..0000000
--- a/profiler/lib.profiler/native/build/buildnative-solaris.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-BuildForJDK()
-{
- JAVA_HOME=$1
- JDK_ID=$2
- echo $JAVA_HOME $JDK_ID
- CC_FLAGS="-I$JAVA_HOME/include -I$JAVA_HOME/include/solaris -DSOLARIS -G -lrt \
- -xO2 -v -mt -KPIC -xCC -Xa -xstrconst"
-
- cc $CC_FLAGS $PROC_FLAGS \
- -o ../../release/lib/deployed/$JDK_ID/solaris-$PROC/libprofilerinterface.so \
- ../src-jdk15/class_file_cache.c \
- ../src-jdk15/attach.c \
- ../src-jdk15/Classes.c \
- ../src-jdk15/HeapDump.c \
- ../src-jdk15/Timers.c \
- ../src-jdk15/GC.c \
- ../src-jdk15/Threads.c \
- ../src-jdk15/Stacks.c \
- ../src-jdk15/common_functions.c
-
- rm -f *.o
-
-}
-
-export PROC=`uname -p`
-echo PROC is $PROC
-
-if [ $PROC = "i386" ]; then
- export PROC_FLAGS="-xregs=no%frameptr"
-elif [ $PROC = "sparc" ]; then
- export PROC_FLAGS="-xregs=no%appl -xmemalign=4s -xarch=v8"
-else
- echo "Invalid architecture " $PROC
-fi
-
-BuildForJDK "$JAVA_HOME_15" "jdk15"
-BuildForJDK "$JAVA_HOME_16" "jdk16"
-
diff --git a/profiler/lib.profiler/release/remote-pack-defs/build.xml b/profiler/lib.profiler/release/remote-pack-defs/build.xml
index b1974b8..73e1cbf 100644
--- a/profiler/lib.profiler/release/remote-pack-defs/build.xml
+++ b/profiler/lib.profiler/release/remote-pack-defs/build.xml
@@ -167,13 +167,6 @@
</antcall>
</target>
- <target name="profiler-server-solsparc-15">
- <antcall target="profiler-server-15">
- <param name="os-version" value="solsparc"/>
- <param name="os-long-version" value="solaris-sparc"/>
- </antcall>
- </target>
-
<target name="profiler-server-solsparcv9-15">
<antcall target="profiler-server-solaris64-15">
<param name="os-version" value="solsparcv9"/>
@@ -291,7 +284,7 @@
</target>
<!-- creates the remote packs as a profiler-server for all platforms -->
- <target name="profiler-server-all" depends="profiler-server-win-15, profiler-server-winamd64-15, profiler-server-win-cvm, profiler-server-mac-15, profiler-server-linux-15, profiler-server-linuxamd64-15, profiler-server-linuxarm-15, profiler-server-linuxarmvfphflt-15, profiler-server-linux-cvm, profiler-server-solx86-15, profiler-server-solamd64-15, profiler-server-solsparc-15, profiler-server-solsparcv9-15" />
+ <target name="profiler-server-all" depends="profiler-server-win-15, profiler-server-winamd64-15, profiler-server-win-cvm, profiler-server-mac-15, profiler-server-linux-15, profiler-server-linuxamd64-15, profiler-server-linuxarm-15, profiler-server-linuxarmvfphflt-15, profiler-server-linux-cvm, profiler-server-solx86-15, profiler-server-solamd64-15, profiler-server-solsparcv9-15" />
</project>
diff --git a/profiler/lib.profiler/release/remote-pack-defs/profile-solsparc-15.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-solsparc-15.sh
deleted file mode 100644
index c1de5ff..0000000
--- a/profiler/lib.profiler/release/remote-pack-defs/profile-solsparc-15.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# This script expects JAVA_HOME to point to the correct JDK 5.0 installation
-# In case you need to customize it, please uncomment and modify the following lines
-
-# JAVA_HOME=/opt/java/jdk1.5.0_04
-# export JAVA_HOME
-
-# Determine the location of the profile script as an absolute directory
-ORIG_DIR=`pwd`
-PROG_NAME=`type $0 | awk '{print $3}'`
-INSTALL_DIR=`dirname $PROG_NAME`
-cd $INSTALL_DIR
-INSTALL_DIR=`pwd`
-cd $ORIG_DIR
-
-$JAVA_HOME/bin/java -agentpath:$INSTALL_DIR/../lib/deployed/jdk15/solaris-sparc/libprofilerinterface.so=$INSTALL_DIR/../lib/,5140 $@
\ No newline at end of file
diff --git a/profiler/lib.profiler/release/remote-pack-defs/profile-solsparc-16.sh b/profiler/lib.profiler/release/remote-pack-defs/profile-solsparc-16.sh
deleted file mode 100644
index b004e36..0000000
--- a/profiler/lib.profiler/release/remote-pack-defs/profile-solsparc-16.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# This script expects JAVA_HOME to point to the correct JDK 5.0 installation
-# In case you need to customize it, please uncomment and modify the following lines
-
-# JAVA_HOME=/opt/java/jdk1.6.0_02
-# export JAVA_HOME
-
-# Determine the location of the profile script as an absolute directory
-ORIG_DIR=`pwd`
-PROG_NAME=`type $0 | awk '{print $3}'`
-INSTALL_DIR=`dirname $PROG_NAME`
-cd $INSTALL_DIR
-INSTALL_DIR=`pwd`
-cd $ORIG_DIR
-
-$JAVA_HOME/bin/java -agentpath:$INSTALL_DIR/../lib/deployed/jdk16/solaris-sparc/libprofilerinterface.so=$INSTALL_DIR/../lib/,5140 $@
diff --git a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/dialog/AttachDialog.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/dialog/AttachDialog.java
index 09a3b0b..00c78d2 100644
--- a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/dialog/AttachDialog.java
+++ b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/dialog/AttachDialog.java
@@ -572,7 +572,6 @@ public class AttachDialog extends AttachWizard {
null,
new OsAction(IntegrationUtils.PLATFORM_MAC_OS),
null,
- new OsAction(IntegrationUtils.PLATFORM_SOLARIS_SPARC_OS),
new OsAction(IntegrationUtils.PLATFORM_SOLARIS_SPARC64_OS),
new OsAction(IntegrationUtils.PLATFORM_SOLARIS_INTEL_OS),
new OsAction(IntegrationUtils.PLATFORM_SOLARIS_AMD64_OS));
diff --git a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java
index 1147eda..0366e44 100644
--- a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java
+++ b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java
@@ -38,7 +38,6 @@ abstract public class AbstractRemotePackExporter {
put(IntegrationUtils.PLATFORM_MAC_OS, "mac"); //NOI18N
put(IntegrationUtils.PLATFORM_SOLARIS_AMD64_OS, "solamd64"); //NOI18N
put(IntegrationUtils.PLATFORM_SOLARIS_INTEL_OS, "solx86"); //NOI18N
- put(IntegrationUtils.PLATFORM_SOLARIS_SPARC_OS, "solsparc"); //NOI18N
put(IntegrationUtils.PLATFORM_SOLARIS_SPARC64_OS, "solsparcv9"); //NOI18N
put(IntegrationUtils.PLATFORM_WINDOWS_AMD64_OS, "winamd64"); //NOI18N
put(IntegrationUtils.PLATFORM_WINDOWS_OS, "win"); //NOI18N
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists