forked from Lainports/freebsd-ports
a0c13b4a90
This release is 1.5 years overdue and 6 months out-of-date, but is an important interim step to the 4.24 release due in June 2022. Massive thanks go to Patrick Mackinlay who resolved the 2 critical bugs preventing update from coming out sooner! Author: Jonathan Chen <jonc@chen.org.nz> PR: 264400
53 lines
3.5 KiB
Text
53 lines
3.5 KiB
Text
diff -ru eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml
|
|
--- eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000
|
|
+++ eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000
|
|
@@ -59,10 +59,10 @@
|
|
</ant>
|
|
</target>
|
|
|
|
- <property name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86_64" value="true" />
|
|
- <target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86_64">
|
|
+ <property name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64" value="true" />
|
|
+ <target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64">
|
|
<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
|
|
- <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/>
|
|
+ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/>
|
|
</ant>
|
|
</target>
|
|
|
|
diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java
|
|
--- eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000
|
|
+++ eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000
|
|
@@ -694,7 +694,7 @@
|
|
arguments.add("-sf"); //$NON-NLS-1$
|
|
arguments.add(links[i]);
|
|
arguments.add(links[i + 1]);
|
|
- script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$
|
|
+ script.printExecTask("ln", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$
|
|
arguments.clear();
|
|
}
|
|
}
|
|
diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
|
|
--- eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000
|
|
+++ eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000
|
|
@@ -912,7 +912,7 @@
|
|
for (int i = 0; i < links.length; i += 2) {
|
|
arguments.add(links[i]);
|
|
arguments.add(links[i + 1]);
|
|
- script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$
|
|
+ script.printExecTask("ln -s", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$
|
|
arguments.clear();
|
|
}
|
|
}
|
|
diff -ru eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java
|
|
--- eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000
|
|
+++ eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000
|
|
@@ -306,6 +306,8 @@
|
|
private String convertOS(String os) {
|
|
if (os == null)
|
|
return null;
|
|
+ if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$
|
|
+ return "FreeBSD"; //$NON-NLS-1$
|
|
if ("win32".equalsIgnoreCase(os)) //$NON-NLS-1$
|
|
return "Windows"; //$NON-NLS-1$
|
|
if ("macosx".equalsIgnoreCase(os)) //$NON-NLS-1$
|