View | Details | Raw Unified | Return to bug 61551 | Differences between
and this patch

Collapse All | Expand All

(-)apisupport/harness/release/build.xml (-1 / +1 lines)
 Lines 154-160    Link Here 
154
    
154
    
155
    <target name="reload" depends="netbeans">
155
    <target name="reload" depends="netbeans">
156
        <ant antfile="${harness.dir}/run.xml" target="run">
156
        <ant antfile="${harness.dir}/run.xml" target="run">
157
            <property name="run.args" value="--reload ${cluster}/${module.jar}"/>
157
            <property name="run.args" value='--reload "${cluster}/${module.jar}"'/>
158
        </ant>
158
        </ant>
159
    </target>
159
    </target>
160
    
160
    
(-)apisupport/harness/release/jnlp.xml (-1 / +1 lines)
 Lines 252-258    Link Here 
252
        <property name="run.javaws" value="javaws"/>
252
        <property name="run.javaws" value="javaws"/>
253
        <property name="run.args" value=""/>
253
        <property name="run.args" value=""/>
254
        <exec executable="${run.javaws}">
254
        <exec executable="${run.javaws}">
255
            <arg path="${build.jnlp.local.dir}/master.jnlp"/>
255
            <arg file="${build.jnlp.local.dir}/master.jnlp"/>
256
            <env key="JAVAWS_VM_ARGS" value="${run.args}"/>
256
            <env key="JAVAWS_VM_ARGS" value="${run.args}"/>
257
        </exec>
257
        </exec>
258
    </target>
258
    </target>
(-)apisupport/harness/release/run.xml (-3 / +3 lines)
 Lines 20-26    Link Here 
20
        </condition>
20
        </condition>
21
        <property name="test.user.dir" location="build/testuserdir"/>
21
        <property name="test.user.dir" location="build/testuserdir"/>
22
        <property name="install" location="${netbeans.dest.dir}"/>
22
        <property name="install" location="${netbeans.dest.dir}"/>
23
        <property name="run.args.common" value="--userdir ${test.user.dir} -J-Dnetbeans.logger.console=true -J-ea"/>
23
        <property name="run.args.common" value='--userdir "${test.user.dir}" -J-Dnetbeans.logger.console=true -J-ea'/>
24
        <!-- In case run from a suite module, to get app.name and/or branding.token: -->
24
        <!-- In case run from a suite module, to get app.name and/or branding.token: -->
25
        <property file="${suite.dir}/nbproject/private/private.properties"/>
25
        <property file="${suite.dir}/nbproject/private/private.properties"/>
26
        <property file="${suite.dir}/nbproject/project.properties"/>
26
        <property file="${suite.dir}/nbproject/project.properties"/>
 Lines 34-40    Link Here 
34
        <property name="run.exe" location="${install}\${run.app.exe}"/>
34
        <property name="run.exe" location="${install}\${run.app.exe}"/>
35
        <property name="run.sh" location="${install}/${run.app.sh}"/>
35
        <property name="run.sh" location="${install}/${run.app.sh}"/>
36
        <mkdir dir="${test.user.dir}/etc"/>
36
        <mkdir dir="${test.user.dir}/etc"/>
37
        <echo file="${test.user.dir}/etc/netbeans.conf">netbeans_extraclusters=${cluster}</echo>
37
        <echo file="${test.user.dir}/etc/netbeans.conf">netbeans_extraclusters="${cluster}"</echo>
38
        <property name="run.args.prepared" value=""/>
38
        <property name="run.args.prepared" value=""/>
39
    </target>
39
    </target>
40
40
 Lines 71-77    Link Here 
71
        <property name="run.exe" location="${platform.cluster}\lib\nbexec.exe"/>
71
        <property name="run.exe" location="${platform.cluster}\lib\nbexec.exe"/>
72
        <property name="run.sh" location="${platform.cluster}/lib/nbexec"/>
72
        <property name="run.sh" location="${platform.cluster}/lib/nbexec"/>
73
        <property name="branding.token" value="-"/> <!-- fallback value if not set -->
73
        <property name="branding.token" value="-"/> <!-- fallback value if not set -->
74
        <property name="run.args.prepared" value="--branding ${branding.token} --clusters ${run.platform.clusters}"/>
74
        <property name="run.args.prepared" value='--branding ${branding.token} --clusters "${run.platform.clusters}"'/>
75
    </target>
75
    </target>
76
76
77
    <target name="run" depends="-prepare-as-app,-prepare-as-platform">
77
    <target name="run" depends="-prepare-as-app,-prepare-as-platform">
(-)apisupport/harness/release/etc/app.conf (-1 / +1 lines)
 Lines 1-5    Link Here 
1
# ${HOME} will be replaced by JVM user.home system property
1
# ${HOME} will be replaced by JVM user.home system property
2
default_userdir=${HOME}/.${APPNAME}/dev
2
default_userdir="${HOME}/.${APPNAME}/dev"
3
default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/dev"
3
default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/dev"
4
4
5
# options used by the launcher by default, can be overridden by explicit
5
# options used by the launcher by default, can be overridden by explicit
(-)apisupport/harness/release/launchers/app.sh (-10 / +10 lines)
 Lines 19-65    Link Here 
19
progdir=`dirname "$PRG"`
19
progdir=`dirname "$PRG"`
20
APPNAME=`basename "$0"`
20
APPNAME=`basename "$0"`
21
21
22
if [ -f "$progdir"/../etc/"$APPNAME".conf ] ; then
22
if [ -f "$progdir/../etc/$APPNAME".conf ] ; then
23
    . "$progdir"/../etc/"$APPNAME".conf
23
    . "$progdir/../etc/$APPNAME".conf
24
fi
24
fi
25
25
26
args="$@"
26
args="$@"
27
27
28
case "`uname`" in
28
case "`uname`" in
29
    Darwin*)
29
    Darwin*)
30
        userdir=${default_mac_userdir}
30
        userdir="${default_mac_userdir}"
31
        ;;
31
        ;;
32
    *)
32
    *)
33
        userdir=${default_userdir}
33
        userdir="${default_userdir}"
34
        ;;
34
        ;;
35
esac
35
esac
36
while [ $# -gt 0 ] ; do
36
while [ $# -gt 0 ] ; do
37
    case "$1" in
37
    case "$1" in
38
        --userdir) shift; if [ $# -gt 0 ] ; then userdir=$1; fi
38
        --userdir) shift; if [ $# -gt 0 ] ; then userdir="$1"; fi
39
            ;;
39
            ;;
40
    esac
40
    esac
41
    shift
41
    shift
42
done
42
done
43
43
44
if [ -f "${userdir}"/etc/"$APPNAME".conf ] ; then
44
if [ -f "${userdir}/etc/$APPNAME".conf ] ; then
45
    . "${userdir}"/etc/"$APPNAME".conf
45
    . "${userdir}/etc/$APPNAME".conf
46
fi
46
fi
47
47
48
readClusters() {
48
readClusters() {
49
  sep=""
49
  sep=""
50
  while read X; do 
50
  while read X; do 
51
    echo -n $sep
51
    echo -n $sep
52
    echo -n $progdir/../$X
52
    echo -n "$progdir/../$X"
53
    sep=":"
53
    sep=":"
54
  done
54
  done
55
}
55
}
56
clusters=`cat $progdir/../etc/"$APPNAME".clusters | readClusters`
56
clusters=`cat "$progdir/../etc/$APPNAME".clusters | readClusters`
57
57
58
if [ ! -z "$extraclusters" ] ; then
58
if [ ! -z "$extraclusters" ] ; then
59
    clusters="$clusters:$extraclusters"
59
    clusters="$clusters:$extraclusters"
60
fi
60
fi
61
61
62
nbexec="$progdir"/../platform6/lib/nbexec
62
nbexec="$progdir/../platform6/lib/nbexec"
63
63
64
case "`uname`" in
64
case "`uname`" in
65
    Darwin*)
65
    Darwin*)
(-)core/launcher/unix/nbexec (-1 / +1 lines)
 Lines 74-80    Link Here 
74
            ;;
74
            ;;
75
        # this has to be here for purposes of updater.jar, but it should be
75
        # this has to be here for purposes of updater.jar, but it should be
76
        # better to handle this argument inside the java launcher part 
76
        # better to handle this argument inside the java launcher part 
77
        -userdir|--userdir) shift; if [ $# -gt 0 ] ; then userdir=$1; fi
77
        -userdir|--userdir) shift; if [ $# -gt 0 ] ; then userdir="$1"; fi
78
            ;;
78
            ;;
79
        -cp|-cp:a|--cp|--cp:a)
79
        -cp|-cp:a|--cp|--cp:a)
80
            shift;
80
            shift;
(-)ide/launcher/unix/netbeans (-3 / +5 lines)
 Lines 37-48    Link Here 
37
#     . /etc/netbeans.conf
37
#     . /etc/netbeans.conf
38
# fi
38
# fi
39
39
40
args="$@"
40
args=""
41
41
42
userdir=${netbeans_default_userdir}
42
userdir="${netbeans_default_userdir}"
43
while [ $# -gt 0 ] ; do
43
while [ $# -gt 0 ] ; do
44
    case "$1" in
44
    case "$1" in
45
        --userdir) shift; if [ $# -gt 0 ] ; then userdir=$1; fi
45
        --userdir) shift; if [ $# -gt 0 ] ; then userdir="$1"; fi
46
            ;;
47
        *) args="$args $1"
46
            ;;
48
            ;;
47
    esac
49
    esac
48
    shift
50
    shift

Return to bug 61551
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2012, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo