Attachment #159996 for bug #255959

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 255959
Collapse All | Expand All

Lines 132-138 Link Here

(-)a/cnd.makeproject.ui/src/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle.properties (-1 / +1 lines)
132	InputTxt=Input	132	InputTxt=Input
133	InputHint=Input	133	InputHint=Input
134	OutputTxt=Output	134	OutputTxt=Output
135	OutputHint=Name of output file or output directory.	135	OutputHint=Name of output file.
136	OtherOptionsTxt=Other Options	136	OtherOptionsTxt=Other Options
137	OtherOptionsHint=Other options	137	OtherOptionsHint=Other options
138	ToolTxt1=Tool	138	ToolTxt1=Tool




            bw.write("\t${RM} -r " + MakeConfiguration.CND_BUILDDIR_MACRO + '/'+MakeConfiguration.CND_CONF_MACRO+ "\n"); // UNIX path // NOI18N
            String output = getOutput(projectDescriptor, conf, compilerSet);
            String outputDir = CndPathUtilities.getDirName(output);
            Set<String> paths = conf.getLinkerConfiguration().getLibrariesConfiguration().getSharedLibraries();
            if (!paths.isEmpty()) {
                bw.write("\t${RM} -r"); //NOI18N
                for (String path : paths) {
                    String baseName = CndPathUtilities.getBaseName(path);
                    bw.write(" " + outputDir + "/" + baseName); //NOI18N
                }
                bw.write("\n"); //NOI18N
                bw.write("\t${RM} " + output + "\n"); //NOI18N
            }
            if (compilerSet != null
                    && compilerSet.getCompilerFlavor().isSunStudioCompiler()
                    && conf.hasCPPFiles(projectDescriptor)) {

Return to bug 255959

Lines 1479-1485 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java (-1 / +10 lines)
1479	bw.write("\t${RM} -r " + MakeConfiguration.CND_BUILDDIR_MACRO + '/'+MakeConfiguration.CND_CONF_MACRO+ "\n"); // UNIX path // NOI18N	1479	bw.write("\t${RM} -r " + MakeConfiguration.CND_BUILDDIR_MACRO + '/'+MakeConfiguration.CND_CONF_MACRO+ "\n"); // UNIX path // NOI18N
1480	String output = getOutput(projectDescriptor, conf, compilerSet);	1480	String output = getOutput(projectDescriptor, conf, compilerSet);
1481	String outputDir = CndPathUtilities.getDirName(output);	1481	String outputDir = CndPathUtilities.getDirName(output);
1482	bw.write("\t${RM} -r " + outputDir + "\n"); // NOI18N	1482	Set<String> paths = conf.getLinkerConfiguration().getLibrariesConfiguration().getSharedLibraries();
		1483	if (!paths.isEmpty()) {
		1484	bw.write("\t${RM} -r"); //NOI18N
		1485	for (String path : paths) {
		1486	String baseName = CndPathUtilities.getBaseName(path);
		1487	bw.write(" " + outputDir + "/" + baseName); //NOI18N
		1488	}
		1489	bw.write("\n"); //NOI18N
		1490	bw.write("\t${RM} " + output + "\n"); //NOI18N
		1491	}
1483	if (compilerSet != null	1492	if (compilerSet != null
1484	&& compilerSet.getCompilerFlavor().isSunStudioCompiler()	1493	&& compilerSet.getCompilerFlavor().isSunStudioCompiler()
1485	&& conf.hasCPPFiles(projectDescriptor)) {	1494	&& conf.hasCPPFiles(projectDescriptor)) {