Unverified Commit 5a5be189 authored by Neil C Smith's avatar Neil C Smith Committed by GitHub
Browse files

Merge pull request #2712 from apache/delivery

Sync delivery to release123 for beta1
parents 9b5068b1 a6a2f8fc
......@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
7E2B3E2AB5EBCABF3971F118A4D288A7E5DAC1DF cpplite-mi-1.0-SNAPSHOT.jar
2BF984B5372F003D3E6C2E96A34F45D659168534 eu.doppel-helix.netbeans.lib:cpplite-mi:f8f8250283be
Name: CND Debugger parts
Description: CND Debugger parts that didn't go through the Apache IP Clearance yet
Version: 1.0-SNAPSHOT
Version: f8f8250283be
License: CDDL-1.0
Origin: NetBeans
......
......@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
release.external/cpplite-mi-1.0-SNAPSHOT.jar=modules/ext/cpplite-mi-1.0-SNAPSHOT.jar
file.reference.cpplite-mi-1.0-SNAPSHOT.jar=release/modules/ext/cpplite-mi-1.0-SNAPSHOT.jar
release.external/cpplite-mi-f8f8250283be.jar=modules/ext/cpplite-mi-f8f8250283be.jar
file.reference.cpplite-mi-f8f8250283be.jar=release/modules/ext/cpplite-mi-f8f8250283be.jar
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
......@@ -190,8 +190,8 @@
<package>org.netbeans.modules.cpplite.debugger.api</package>
</friend-packages>
<class-path-extension>
<runtime-relative-path>ext/cpplite-mi-1.0-SNAPSHOT.jar</runtime-relative-path>
<binary-origin>external/cpplite-mi-1.0-SNAPSHOT.jar</binary-origin>
<runtime-relative-path>ext/cpplite-mi-f8f8250283be.jar</runtime-relative-path>
<binary-origin>external/cpplite-mi-f8f8250283be.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
......
......@@ -31,6 +31,8 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.math.BigInteger;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.nio.file.Files;
......@@ -177,20 +179,22 @@ public class DownloadBinaries extends Task {
private byte[] mavenFile(MavenCoordinate mc) throws IOException {
String cacheName = mc.toMavenPath();
File local = new File(new File(new File(new File(System.getProperty("user.home")), ".m2"), "repository"), cacheName.replace('/', File.separatorChar));
List<String> urls = new ArrayList<>();
if (local.isFile()) {
urls.add(local.toURI().toString());
}
for (String prefix : repos.split(" ")) {
urls.add(prefix + cacheName);
}
for (String url : urls) {
try {
if (url.startsWith("file:")) {
File file = new File(new URI(url));
if (!file.exists()) {
continue;
}
}
URL u = new URL(url);
log("Trying: " + url, Project.MSG_VERBOSE);
return downloadFromServer(u);
} catch (IOException ex) {
} catch (IOException | URISyntaxException ex) {
//Try the next URL
}
}
......
......@@ -22,4 +22,5 @@
<project name="binaries-default-properties" default="netbeans" basedir=".">
<property name="binaries.cache" location="${user.home}/.hgexternalcache"/>
<property name="binaries.server" value="https://netbeans.osuosl.org/binaries/"/>
<property name="binaries.repos" value="https://repo1.maven.org/maven2/"/>
</project>
......@@ -69,7 +69,7 @@
<taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="${build.ant.classes.dir}"/>
<taskdef name="configureproxy" classname="org.netbeans.nbbuild.extlibs.ConfigureProxy" classpath="${build.ant.classes.dir}"/>
<property name="have-downloadbinaries-task" value="true" />
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}" repos="${binaries.repos}">
<manifest dir="${nb_all}">
<include name="nbbuild/external/binaries-list"/>
<include name="platform/libs.junit4/external/binaries-list"/>
......@@ -198,7 +198,7 @@ metabuild.hash=${metabuild.hash}</echo>
<target name="download-all-extbins" unless="ext.binaries.downloaded" depends="bootstrap">
<echo>Downloading external binaries (*/external/ directories)...</echo>
<!-- optionnal reporttofile used to speed resolving artefacts resolution for maven artefacts -->
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}" >
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}" repos="${binaries.repos}" >
<manifest dir="${nb_all}">
<include name="**/external/binaries-list"/>
</manifest>
......@@ -235,7 +235,7 @@ metabuild.hash=${metabuild.hash}</echo>
<map from="${nb_all}/" to=""/>
<globmapper from="*" to="*/external/binaries-list"/>
</pathconvert>
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}" repos="${binaries.repos}">
<manifest dir="${nb_all}" includes="${modules.binaries-list}"/>
</downloadbinaries>
</target>
......@@ -468,7 +468,7 @@ metabuild.hash=${metabuild.hash}</echo>
</target>
<target name="-download-nb-windows-launchers" depends="init,-check-nb-cluster" if="has.nb.cluster" unless="do.build.windows.launchers">
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}" repos="${binaries.repos}">
<manifest dir="${nb_all}" includes="nb/ide.launcher/external/binaries-list"/>
</downloadbinaries>
......@@ -1310,7 +1310,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
</fileset>
</subant>
<taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="${nbantext.jar}"/>
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}" clean="true">
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}" repos="${binaries.repos}" clean="true">
<manifest dir="${nb_all}">
<include name="*/external/binaries-list"/>
<include name="contrib/*/external/binaries-list"/>
......@@ -1689,7 +1689,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<pathconvert property="source.dirs" pathsep="," refid="source.dirset">
<regexpmapper from="${nb_all}/(.*)$" to="\1/**/*" handledirsep="yes"/>
</pathconvert>
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}"> <!--XXX-->
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}" repos="${binaries.repos}"> <!--XXX-->
<manifest dir="${nb_all}">
<include name="libs.antlr3.devel/external/binaries-list"/>
</manifest>
......@@ -2172,7 +2172,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<taskdef name="exclusionsfromlicenseinfo" classname="org.netbeans.nbbuild.extlibs.ExclusionsFromLicenseInfo" classpath="${nbantext.jar}"/>
<taskdef name="reportFromLicenseinfo" classname="org.netbeans.nbbuild.extlibs.ReportFromLicenseinfo" classpath="${nbantext.jar}"/>
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}" repos="${binaries.repos}">
<manifest dir="${nb_all}">
<include name="nbbuild/external/binaries-list"/>
</manifest>
......
......@@ -237,6 +237,11 @@ class DocumentSwitcherTable extends SwitcherTable {
int res = project.getDisplayName().compareTo( otherProject.getDisplayName() );
if( res != 0 )
return res;
res = project.getPath().compareTo(otherProject.getPath());
if (res != 0) {
return res;
}
}
}
return super.compareTo( o );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment