--- old/make/hotspot/src/classes/build/tools/projectcreator/Util.java 2020-04-29 12:12:17.312610195 +0200 +++ /dev/null 2020-02-11 10:29:13.086348146 +0100 @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package build.tools.projectcreator; - -import java.util.*; -import java.io.File; - -public class Util { - - static String join(String padder, Vector v) { - return join(padder, v, false); - } - - static String join(String padder, Vector v, boolean quoted) { - StringBuffer sb = new StringBuffer(); - - for (Iterator iter = v.iterator(); iter.hasNext(); ) { - if (quoted) { - sb.append('"'); - } - sb.append(iter.next()); - if (quoted) { - sb.append('"'); - } - if (iter.hasNext()) sb.append(padder); - } - - return sb.toString(); - } - - - static String prefixed_join(String padder, Vector v, boolean quoted) { - StringBuffer sb = new StringBuffer(); - - for (Iterator iter = v.iterator(); iter.hasNext(); ) { - sb.append(padder); - - if (quoted) { - sb.append('"'); - } - sb.append((String)iter.next()); - if (quoted) { - sb.append('"'); - } - } - - return sb.toString(); - } - - - static String normalize(String file) { - file = file.replace('\\', '/'); - if (file.length() > 2) { - if (file.charAt(1) == ':' && file.charAt(2) == '/') { - // convert drive letter to uppercase - String drive = file.substring(0, 1).toUpperCase(); - return drive + file.substring(1); - } - } - return file; - } - - static String sep = File.separator; -} --- /dev/null 2020-02-11 10:29:13.086348146 +0100 +++ new/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/Util.java 2020-04-29 12:12:16.936610198 +0200 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +package build.tools.projectcreator; + +import java.util.*; +import java.io.File; + +public class Util { + + static String join(String padder, Vector v) { + return join(padder, v, false); + } + + static String join(String padder, Vector v, boolean quoted) { + StringBuffer sb = new StringBuffer(); + + for (Iterator iter = v.iterator(); iter.hasNext(); ) { + if (quoted) { + sb.append('"'); + } + sb.append(iter.next()); + if (quoted) { + sb.append('"'); + } + if (iter.hasNext()) sb.append(padder); + } + + return sb.toString(); + } + + + static String prefixed_join(String padder, Vector v, boolean quoted) { + StringBuffer sb = new StringBuffer(); + + for (Iterator iter = v.iterator(); iter.hasNext(); ) { + sb.append(padder); + + if (quoted) { + sb.append('"'); + } + sb.append((String)iter.next()); + if (quoted) { + sb.append('"'); + } + } + + return sb.toString(); + } + + + static String normalize(String file) { + file = file.replace('\\', '/'); + if (file.length() > 2) { + if (file.charAt(1) == ':' && file.charAt(2) == '/') { + // convert drive letter to uppercase + String drive = file.substring(0, 1).toUpperCase(); + return drive + file.substring(1); + } + } + return file; + } + + static String sep = File.separator; +}