Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NETBEANS-4305] - cleanup dead hardware support #2131

Merged
merged 1 commit into from Sep 24, 2020
Merged

[NETBEANS-4305] - cleanup dead hardware support #2131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions ide/dlight.nativeexecution/nbproject/project.properties
View file
Open in desktop
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ide/dlight.nativeexecution/tools/Makefile
View file
Open in desktop
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ide/dlight.nativeexecution/tools/build-pty-support.sh
View file
Open in desktop
Expand Up @@ -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
Expand Down
13 changes: 3 additions & 10 deletions ide/dlight.nativeexecution/tools/killall/Makefile
View file
Open in desktop
Expand Up @@ -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

Expand All @@ -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)
Expand Down Expand Up @@ -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

Expand All @@ -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)
Expand Down
1 change: 0 additions & 1 deletion ide/dlight.nativeexecution/tools/pty/Makefile
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ide/dlight.nativeexecution/tools/unbuffer/Makefile
View file
Open in desktop
Expand Up @@ -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
Expand Down
11 changes: 2 additions & 9 deletions nbi/engine/src/org/netbeans/installer/utils/system/SolarisNativeUtils.java
View file
Open in desktop
Expand Up @@ -28,11 +28,6 @@
*/
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
Expand Down Expand Up @@ -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 :
Expand Down
7 changes: 0 additions & 7 deletions nbi/infra/build/jvm/build.xml
View file
Open in desktop
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand Down
49 changes: 0 additions & 49 deletions nbi/infra/build/jvm/tools/unzipsfx/solaris-sparc/LICENSE
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java
View file
Open in desktop
Expand Up @@ -66,18 +66,6 @@ public class UpdaterFrame extends javax.swing.JPanel
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",
Expand Down Expand Up @@ -311,27 +299,6 @@ public void run() {
});
}

/** 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;
Expand Down
18 changes: 5 additions & 13 deletions ...ib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java
View file
Open in desktop
Expand Up @@ -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
BradWalker marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down Expand Up @@ -270,12 +270,6 @@ public static String getPlatformByOSAndArch(int platform, int dataModel, String
}
} 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
}
Expand Down Expand Up @@ -397,13 +391,13 @@ public static String getLocalPlatform(int architecture) {
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;
Expand Down Expand Up @@ -469,8 +463,6 @@ public static String getOSPlatformNativeLibrariesDirectoryName(String targetPlat
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)) {
Expand Down Expand Up @@ -646,7 +638,7 @@ public static boolean isWindowsPlatform(String targetPlatform) {

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) {
Expand Down
57 changes: 0 additions & 57 deletions profiler/lib.profiler/native/build/buildnative-solaris.sh
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions profiler/lib.profiler/release/remote-pack-defs/build.xml
View file
Open in desktop
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>