src/jdk.jpackage/share/native/libjpackage/Helpers.cpp
author herrick
Mon, 03 Dec 2018 15:06:33 -0500
branchJDK-8200758-branch
changeset 57054 32d2b2d2d353
permissions -rw-r--r--
8213747: Makefile Improvements to Lib-jdk.packager.gmk Reviewed-by: ihse, almatvee
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
57054
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
     1
/*
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
     2
 * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
     4
 *
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    10
 *
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    15
 * accompanied this code).
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    16
 *
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    20
 *
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    23
 * questions.
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    24
 */
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    25
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    26
#include "Helpers.h"
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    27
#include "PlatformString.h"
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    28
#include "PropertyFile.h"
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    29
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    30
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    31
bool Helpers::SplitOptionIntoNameValue(
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    32
        TString option, TString& Name, TString& Value) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    33
    bool hasValue = false;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    34
    Name = _T("");
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    35
    Value = _T("");
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    36
    unsigned int index = 0;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    37
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    38
    for (; index < option.length(); index++) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    39
        TCHAR c = option[index];
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    40
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    41
        switch (c) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    42
            case '=': {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    43
                index++;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    44
                hasValue = true;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    45
                break;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    46
            }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    47
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    48
            case '\\': {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    49
                if (index + 1 < option.length()) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    50
                    c = option[index + 1];
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    51
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    52
                    switch (c) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    53
                        case '\\': {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    54
                            index++;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    55
                            Name += '\\';
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    56
                            break;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    57
                        }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    58
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    59
                        case '=': {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    60
                            index++;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    61
                            Name += '=';
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    62
                            break;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    63
                        }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    64
                    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    65
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    66
                }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    67
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    68
                continue;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    69
            }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    70
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    71
            default: {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    72
                Name += c;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    73
                continue;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    74
            }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    75
        }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    76
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    77
        break;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    78
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    79
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    80
    if (hasValue) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    81
        Value = option.substr(index, index - option.length());
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    82
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    83
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    84
    return (option.length() > 0);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    85
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    86
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    87
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    88
TString Helpers::ReplaceString(TString subject, const TString& search,
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    89
                            const TString& replace) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    90
    size_t pos = 0;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    91
    while((pos = subject.find(search, pos)) != TString::npos) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    92
            subject.replace(pos, search.length(), replace);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    93
            pos += replace.length();
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    94
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    95
    return subject;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    96
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    97
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    98
TString Helpers::ConvertIdToFilePath(TString Value) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
    99
    TString search;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   100
    search = '.';
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   101
    TString replace;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   102
    replace = '/';
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   103
    TString result = ReplaceString(Value, search, replace);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   104
    return result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   105
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   106
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   107
TString Helpers::ConvertIdToJavaPath(TString Value) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   108
    TString search;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   109
    search = '.';
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   110
    TString replace;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   111
    replace = '/';
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   112
    TString result = ReplaceString(Value, search, replace);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   113
    search = '\\';
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   114
    result = ReplaceString(result, search, replace);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   115
    return result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   116
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   117
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   118
TString Helpers::ConvertJavaPathToId(TString Value) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   119
    TString search;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   120
    search = '/';
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   121
    TString replace;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   122
    replace = '.';
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   123
    TString result = ReplaceString(Value, search, replace);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   124
    return result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   125
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   126
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   127
OrderedMap<TString, TString>
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   128
        Helpers::GetJVMArgsFromConfig(IPropertyContainer* config) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   129
    OrderedMap<TString, TString> result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   130
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   131
    for (unsigned int index = 0; index < config->GetCount(); index++) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   132
        TString argname =
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   133
                TString(_T("jvmarg.")) + PlatformString(index + 1).toString();
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   134
        TString argvalue;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   135
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   136
        if (config->GetValue(argname, argvalue) == false) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   137
            break;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   138
        }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   139
        else if (argvalue.empty() == false) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   140
            TString name;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   141
            TString value;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   142
            if (Helpers::SplitOptionIntoNameValue(argvalue, name, value)) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   143
                result.Append(name, value);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   144
            }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   145
        }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   146
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   147
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   148
    return result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   149
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   150
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   151
std::list<TString> Helpers::GetArgsFromConfig(IPropertyContainer* config) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   152
    std::list<TString> result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   153
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   154
    for (unsigned int index = 0; index < config->GetCount(); index++) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   155
        TString argname = TString(_T("arg."))
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   156
                + PlatformString(index + 1).toString();
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   157
        TString argvalue;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   158
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   159
        if (config->GetValue(argname, argvalue) == false) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   160
            break;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   161
        }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   162
        else if (argvalue.empty() == false) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   163
            result.push_back((argvalue));
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   164
        }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   165
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   166
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   167
    return result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   168
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   169
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   170
void AppendToIni(PropertyFile &Source, IniFile* Destination, TString Key) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   171
    TString value;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   172
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   173
    if (Source.GetValue(Key, value) == true) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   174
        Platform& platform = Platform::GetInstance();
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   175
        std::map<TString, TString> keys = platform.GetKeys();
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   176
        Destination->Append(keys[CONFIG_SECTION_APPLICATION], Key, value);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   177
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   178
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   179
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   180
void Helpers::LoadOldConfigFile(TString FileName, IniFile* Container) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   181
    PropertyFile propertyFile;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   182
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   183
    if (propertyFile.LoadFromFile(FileName) == true) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   184
        Platform& platform = Platform::GetInstance();
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   185
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   186
        std::map<TString, TString> keys = platform.GetKeys();
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   187
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   188
        // Application Section
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   189
        AppendToIni(propertyFile, Container, keys[CONFIG_MAINJAR_KEY]);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   190
        AppendToIni(propertyFile, Container, keys[CONFIG_MAINMODULE_KEY]);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   191
        AppendToIni(propertyFile, Container, keys[CONFIG_MAINCLASSNAME_KEY]);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   192
        AppendToIni(propertyFile, Container, keys[CONFIG_CLASSPATH_KEY]);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   193
        AppendToIni(propertyFile, Container, keys[APP_NAME_KEY]);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   194
        AppendToIni(propertyFile, Container, keys[CONFIG_APP_ID_KEY]);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   195
        AppendToIni(propertyFile, Container, keys[JVM_RUNTIME_KEY]);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   196
        AppendToIni(propertyFile, Container, keys[JPACKAGE_APP_DATA_DIR]);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   197
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   198
        AppendToIni(propertyFile, Container, keys[CONFIG_APP_MEMORY]);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   199
        AppendToIni(propertyFile, Container, keys[CONFIG_SPLASH_KEY]);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   200
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   201
        // JVMOptions Section
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   202
        OrderedMap<TString, TString> JVMArgs =
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   203
                Helpers::GetJVMArgsFromConfig(&propertyFile);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   204
        Container->AppendSection(keys[CONFIG_SECTION_JVMOPTIONS], JVMArgs);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   205
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   206
        // ArgOptions Section
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   207
        std::list<TString> args = Helpers::GetArgsFromConfig(&propertyFile);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   208
        OrderedMap<TString, TString> convertedArgs;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   209
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   210
        for (std::list<TString>::iterator iterator = args.begin();
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   211
                iterator != args.end(); iterator++) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   212
            TString arg = *iterator;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   213
            TString name;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   214
            TString value;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   215
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   216
            if (Helpers::SplitOptionIntoNameValue(arg, name, value) == true) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   217
                convertedArgs.Append(name, value);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   218
            }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   219
        }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   220
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   221
        Container->AppendSection(keys[CONFIG_SECTION_ARGOPTIONS],
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   222
                convertedArgs);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   223
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   224
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   225
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   226
std::list<TString>
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   227
        Helpers::MapToNameValueList(OrderedMap<TString, TString> Map) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   228
    std::list<TString> result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   229
    std::vector<TString> keys = Map.GetKeys();
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   230
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   231
    for (OrderedMap<TString, TString>::const_iterator iterator = Map.begin();
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   232
            iterator != Map.end(); iterator++) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   233
       pair<TString, TString> *item = *iterator;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   234
       TString key = item->first;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   235
       TString value = item->second;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   236
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   237
       if (value.length() == 0) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   238
           result.push_back(key);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   239
       } else {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   240
           result.push_back(key + _T('=') + value);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   241
        }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   242
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   243
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   244
    return result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   245
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   246
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   247
TString Helpers::NameValueToString(TString name, TString value) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   248
    TString result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   249
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   250
    if (value.empty() == true) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   251
        result = name;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   252
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   253
    else {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   254
        result = name + TString(_T("=")) + value;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   255
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   256
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   257
    return result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   258
}
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   259
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   260
std::list<TString> Helpers::StringToArray(TString Value) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   261
    std::list<TString> result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   262
    TString line;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   263
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   264
    for (unsigned int index = 0; index < Value.length(); index++) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   265
        TCHAR c = Value[index];
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   266
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   267
        switch (c) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   268
            case '\n': {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   269
                result.push_back(line);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   270
                line = _T("");
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   271
                break;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   272
            }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   273
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   274
            case '\r': {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   275
                result.push_back(line);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   276
                line = _T("");
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   277
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   278
                if (Value[index + 1] == '\n')
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   279
                    index++;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   280
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   281
                break;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   282
            }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   283
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   284
            default: {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   285
                line += c;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   286
            }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   287
        }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   288
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   289
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   290
    // The buffer may not have ended with a Carriage Return/Line Feed.
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   291
    if (line.length() > 0) {
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   292
        result.push_back(line);
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   293
    }
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   294
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   295
    return result;
32d2b2d2d353 8213747: Makefile Improvements to Lib-jdk.packager.gmk
herrick
parents:
diff changeset
   296
}