This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 177820
Collapse All | Expand All

(-)a/apisupport.harness/release/run.xml (-1 / +4 lines)
Lines 147-155 Link Here
147 
                <path refid="cluster.path.id"/>
 147 
                <path refid="cluster.path.id"/>
148 
            </path>
 148 
            </path>
149 
        </pathconvert>
 149 
        </pathconvert>
150 
        <condition property="nbexec.path" value="platform*/lib/nbexec64.exe" else="platform*/lib/nbexec.exe">
151 
            <equals arg1="${os.arch}" arg2="amd64"/>
152 
        </condition>
150 
        <pathconvert property="run.exe">
 153 
        <pathconvert property="run.exe">
151 
            <path>
 154 
            <path>
152 
                <fileset dir="${install}" includes="platform*/lib/nbexec.exe"/>
 155 
                <fileset dir="${install}" includes="${nbexec.path}"/>
153 
            </path>
 156 
            </path>
154 
        </pathconvert>
 157 
        </pathconvert>
155 
        <pathconvert property="run.sh">
 158 
        <pathconvert property="run.sh">
(-)a/ide/launcher/windows/nblauncher.cpp (+4 lines)
Lines 51-57 Link Here
51 

          51
          

        

        

          52
          
using namespace std;

          52
          
using namespace std;

        

        

          53
          

          53
          

        

            

              
              
              54
              
#if defined(_WIN64) || defined(WIN64) || defined(__MINGW64__)

            

            

              55
              
const char *NbLauncher::NBEXEC_FILE_PATH = "\\lib\\nbexec64.dll";

            

            

              56
              
#else

            

        

          54
          
const char *NbLauncher::NBEXEC_FILE_PATH = "\\lib\\nbexec.dll";

          57
          
const char *NbLauncher::NBEXEC_FILE_PATH = "\\lib\\nbexec.dll";

        

            

              
              
              58
              
#endif

            

        

          55
          
const char *NbLauncher::OPT_NB_DEFAULT_USER_DIR = "netbeans_default_userdir=";

          59
          
const char *NbLauncher::OPT_NB_DEFAULT_USER_DIR = "netbeans_default_userdir=";

        

        

          56
          
const char *NbLauncher::OPT_NB_DEFAULT_OPTIONS = "netbeans_default_options=";

          60
          
const char *NbLauncher::OPT_NB_DEFAULT_OPTIONS = "netbeans_default_options=";

        

        

          57
          
const char *NbLauncher::OPT_NB_EXTRA_CLUSTERS = "netbeans_extraclusters=";

          61
          
const char *NbLauncher::OPT_NB_EXTRA_CLUSTERS = "netbeans_extraclusters=";

        



(-)a/o.n.bootstrap/launcher/windows/nbexecexe.cpp
      (-1 / +6 lines)




  

    
      
            Lines 50-54
          
      
      
        Link Here
      
    
  

        

          50
          
int main(int argc, char *argv[]) {

          50
          
int main(int argc, char *argv[]) {

        

        

          51
          
    checkLoggingArg(argc, argv, true);

          51
          
    checkLoggingArg(argc, argv, true);

        

        

          52
          
    NBExecLoader loader;

          52
          
    NBExecLoader loader;

        

          
            

              53
              
    return loader.start("nbexec.dll", argc - 1, argv + 1);


              53
              

            

            

              
              

              54
              
#if defined(_WIN64) || defined(WIN64) || defined(__MINGW64__)

            

            


              55
              
	return loader.start("nbexec64.dll", argc - 1, argv + 1);

            

            


              56
              
#else

            

            


              57
              
	return loader.start("nbexec.dll", argc - 1, argv + 1);

            

            


              58
              
#endif	

            

        

          54
          
}

          59
          
}

        






  

  Return to bug 177820