1.1 --- a/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/BundleGlobal.properties	Thu Feb 03 17:22:57 2005 +0000
     1.2 +++ b/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/BundleGlobal.properties	Thu Feb 03 17:45:25 2005 +0000
     1.3 @@ -75,6 +75,9 @@
     1.4  CVS_OPTIONS_GLOBAL_COMPRESSION_Level_7=7
     1.5  CVS_OPTIONS_GLOBAL_COMPRESSION_Level_8=8
     1.6  CVS_OPTIONS_GLOBAL_COMPRESSION_Level_9=9
     1.7 +CVS_APPLY_CVSROOT=Apply the CVSROOT option (-d).
     1.8 +ACSD_CVS_APPLY_CVSROOT=Apply the -d global option with the CVSROOT value. Uncheck when sources are from different locations.
     1.9 +ACS_CVS_APPLY_CVSROOT_mnc=A
    1.10  
    1.11  CVS_MSG_PROMPT_FOR_AUTO_EDIT=Do you want to run the 'Edit' command to make the file writable?
    1.12  

     2.1 --- a/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml	Thu Feb 03 17:22:57 2005 +0000
     2.2 +++ b/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml	Thu Feb 03 17:45:25 2005 +0000
     2.3 @@ -236,25 +236,25 @@
     2.4        <value>cvs</value>
     2.5      </variable>
     2.6      <variable name="CVS_DEF_EXE" basic="false">
     2.7 -      <value>${QUOTE}${CVS_EXE}${QUOTE} -d ${QUOTE}${CVSROOT}${QUOTE}</value>
     2.8 -      <value if="IS_WIN9X">${QUOTE}${CVS_EXE_\/}${QUOTE} -d ${QUOTE}${CVSROOT}${QUOTE}</value>
     2.9 +      <value>${QUOTE}${CVS_EXE}${QUOTE} $[? APPLY_CVSROOT] [-d ${QUOTE}${CVSROOT}${QUOTE}] []</value>
    2.10 +      <value if="IS_WIN9X">${QUOTE}${CVS_EXE_\/}${QUOTE} $[? APPLY_CVSROOT] [-d ${QUOTE}${CVSROOT}${QUOTE}] []</value>
    2.11      </variable>
    2.12      <variable name="EXECUTE" basic="false">
    2.13        <value>${RUN} ${CVS_DEF_EXE} </value>
    2.14 -      <value if="BUILT-IN">org.netbeans.modules.vcs.profiles.cvsprofiles.commands.JavaCvsCommand.class ${QUOTE}dir=${ROOTDIR}${QUOTE} -d ${QUOTE}${CVSROOT}${QUOTE} </value>
    2.15 +      <value if="BUILT-IN">org.netbeans.modules.vcs.profiles.cvsprofiles.commands.JavaCvsCommand.class ${QUOTE}dir=${ROOTDIR}${QUOTE} $[? APPLY_CVSROOT] [-d ${QUOTE}${CVSROOT}${QUOTE}] [] </value>
    2.16      </variable>
    2.17        <variable name="EXECUTE_NO_CD" basic="false">
    2.18          <value>${RUN_NO_CD} ${CVS_DEF_EXE} </value>
    2.19 -        <value if="BUILT-IN">org.netbeans.modules.vcs.profiles.cvsprofiles.commands.JavaCvsCommand.class -d ${QUOTE}${CVSROOT}${QUOTE} </value>
    2.20 +        <value if="BUILT-IN">org.netbeans.modules.vcs.profiles.cvsprofiles.commands.JavaCvsCommand.class $[? APPLY_CVSROOT] [-d ${QUOTE}${CVSROOT}${QUOTE}] [] </value>
    2.21        </variable>
    2.22  
    2.23      <variable name="CDM_EXECUTE" basic="false">
    2.24        <value>${RUNCDM} ${CVS_DEF_EXE} </value>
    2.25 -      <value if="BUILT-IN">org.netbeans.modules.vcs.profiles.cvsprofiles.commands.JavaCvsCommand.class ${QUOTE}dir=${MODDIR}${QUOTE} -d ${QUOTE}${CVSROOT}${QUOTE} </value>
    2.26 +      <value if="BUILT-IN">org.netbeans.modules.vcs.profiles.cvsprofiles.commands.JavaCvsCommand.class ${QUOTE}dir=${MODDIR}${QUOTE} $[? APPLY_CVSROOT] [-d ${QUOTE}${CVSROOT}${QUOTE}] [] </value>
    2.27      </variable>
    2.28      <variable name="CDW_EXECUTE" basic="false">
    2.29        <value>${RUNCDW} ${CVS_DEF_EXE} </value>
    2.30 -      <value if="BUILT-IN">org.netbeans.modules.vcs.profiles.cvsprofiles.commands.JavaCvsCommand.class ${QUOTE}dir=${WORKDIR}${QUOTE} -d ${QUOTE}${CVSROOT}${QUOTE} </value>
    2.31 +      <value if="BUILT-IN">org.netbeans.modules.vcs.profiles.cvsprofiles.commands.JavaCvsCommand.class ${QUOTE}dir=${WORKDIR}${QUOTE} $[? APPLY_CVSROOT] [-d ${QUOTE}${CVSROOT}${QUOTE}] [] </value>
    2.32      </variable>
    2.33      <variable name="SHELL" basic="true" label="ResourceMsg(Unix_Shell)" labelMnemonic="ResourceMsg(Unix_Shell_Mnemonic)" localFile="true" localDir="false" executable="false" order="6" if="IS_WIN9X">
    2.34        <value>sh.exe</value>
    2.35 @@ -277,7 +277,7 @@
    2.36      <variable name="GLOBAL_INPUT_DESCRIPTOR" basic="false">
    2.37        <value>LABEL(ResourceMsg(CVS_OPTIONS_GLOBAL_Label),
    2.38                  ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_CVS_OPTIONS_GLOBAL_Label)))
    2.39 -             VARIABLE_DEFAULTS(COMPRESSION USER)
    2.40 +             VARIABLE_DEFAULTS(COMPRESSION USER, CHECKOUT_RO_RW USER, APPLY_CVSROOT USER)
    2.41               ASK_FOR(DISK_CHANGE, "ResourceMsg(CVS_OPTIONS_GLOBAL_PREVIEW)","",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_CVS_OPTIONS_GLOBAL_PREVIEW);;MNEMONIC_ResourceMsg(ACS_CVS_OPTIONS_GLOBAL_PREVIEW_mnc)))
    2.42               ASK_FOR(CHECKOUT_RO_RW, "ResourceMsg(CVS_OPTIONS_GLOBAL_RO)", "false",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_CVS_OPTIONS_GLOBAL_RO);;MNEMONIC_ResourceMsg(ACS_CVS_OPTIONS_GLOBAL_RO_mnc)) ,"-r", "")
    2.43               SELECT_COMBO(COMPRESSION, "ResourceMsg(CVS_OPTIONS_GLOBAL_COMPRESSION_Label)", "",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_CVS_OPTIONS_GLOBAL_COMPRESSION_Label);;MNEMONIC_ResourceMsg(ACS_CVS_OPTIONS_GLOBAL_COMPRESSION_Label_mnc)),
    2.44 @@ -291,8 +291,13 @@
    2.45                   ["ResourceMsg(CVS_OPTIONS_GLOBAL_COMPRESSION_Level_7)", "-z 7"],
    2.46                   ["ResourceMsg(CVS_OPTIONS_GLOBAL_COMPRESSION_Level_8)", "-z 8"],
    2.47                   ["ResourceMsg(CVS_OPTIONS_GLOBAL_COMPRESSION_Level_9)", "-z 9"])
    2.48 +             ASK_FOR(APPLY_CVSROOT, "ResourceMsg(CVS_APPLY_CVSROOT)", "true", ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_CVS_APPLY_CVSROOT);;MNEMONIC_ResourceMsg(ACS_CVS_APPLY_CVSROOT_mnc)), ENABLE(CVSROOT_INFO))
    2.49 +             TEXT(CVSROOT_INFO)
    2.50        </value>
    2.51      </variable>
    2.52 +    <variable name="CVSROOT_INFO" basic="false">
    2.53 +        <value>CVSROOT = ${CVSROOT}</value>
    2.54 +    </variable>
    2.55      <variable name="NOT_USE_CVSRC" basic="false">
    2.56          <!-- #52139 ASK_FOR(NOT_USE_CVSRC, "ResourceMsg(CVS_OPTIONS_GLOBAL_NORC)", "true",ACCESSIBILITY(DESCRIPTION_ResourceMsg(ACSD_CVS_OPTIONS_GLOBAL_NORC);;MNEMONIC_ResourceMsg(ACS_CVS_OPTIONS_GLOBAL_NORC_mnc)), "-f", "") -->
    2.57          <value>-f</value>