Attachment #9579 for bug #32437

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




package org.netbeans.nbbuild;

import java.io.* ;
import java.net.MalformedURLException;
import java.util.* ;

import org.apache.tools.ant.* ;


    makenbm.setModInfo( modInfo) ;
    makenbm.setLangCode( locale) ;
    String fname = getLocalizedFileName( locale);
    makenbm.setFile( new File( getProject().getBaseDir().getAbsolutePath() + 
			       File.separator + fname)) ;
    makenbm.setTopdir( topDir) ;
    makenbm.setIsStandardInclude( false) ;
    String distbase = getProject().getProperty("dist.base");
    if (distbase != null) {
        try {
            int idx = fname.lastIndexOf('/');
            makenbm.setDistribution(distbase + "/" + fname.substring(idx + 1));
        } catch (MalformedURLException e) {
            throw new BuildException(e, getLocation());
        }
    }
    licenseFile = getLicenseFile( locale) ;
    if( licenseFile != null) {
      MakeLNBM.Blurb blurb = makenbm.createLicense() ;

Lines 18-24 Link Here

(-)translatedfiles/build.xml (-1 / +1 lines)
18	<!-- Need todo: Decide how to handle these two attributes of NBM, or	18	<!-- Need todo: Decide how to handle these two attributes of NBM, or
19	whether they're really needed. -->	19	whether they're really needed. -->
20	<property name="homepage.base" value="netbeans.org"/>	20	<property name="homepage.base" value="netbeans.org"/>
21	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>	21	<property name="dist.base" value="http://www.netbeans.org/download/nbms/40"/>
22		22
23	<property name="nbroot" location=".."/>	23	<property name="nbroot" location=".."/>
24		24

Return to bug 32437

Lines 14-19 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/LocMakeNBM.java (-1 / +12 lines)
14	package org.netbeans.nbbuild;	14	package org.netbeans.nbbuild;
15		15
16	import java.io.* ;	16	import java.io.* ;
		17	import java.net.MalformedURLException;
17	import java.util.* ;	18	import java.util.* ;
18		19
19	import org.apache.tools.ant.* ;	20	import org.apache.tools.ant.* ;
Lines 171-180 Link Here
171		172
172	makenbm.setModInfo( modInfo) ;	173	makenbm.setModInfo( modInfo) ;
173	makenbm.setLangCode( locale) ;	174	makenbm.setLangCode( locale) ;
		175	String fname = getLocalizedFileName( locale);
174	makenbm.setFile( new File( getProject().getBaseDir().getAbsolutePath() +	176	makenbm.setFile( new File( getProject().getBaseDir().getAbsolutePath() +
175	File.separator + getLocalizedFileName( locale))) ;	177	File.separator + fname)) ;
176	makenbm.setTopdir( topDir) ;	178	makenbm.setTopdir( topDir) ;
177	makenbm.setIsStandardInclude( false) ;	179	makenbm.setIsStandardInclude( false) ;
		180	String distbase = getProject().getProperty("dist.base");
		181	if (distbase != null) {
		182	try {
		183	int idx = fname.lastIndexOf('/');
		184	makenbm.setDistribution(distbase + "/" + fname.substring(idx + 1));
		185	} catch (MalformedURLException e) {
		186	throw new BuildException(e, getLocation());
		187	}
		188	}
178	licenseFile = getLicenseFile( locale) ;	189	licenseFile = getLicenseFile( locale) ;
179	if( licenseFile != null) {	190	if( licenseFile != null) {
180	MakeLNBM.Blurb blurb = makenbm.createLicense() ;	191	MakeLNBM.Blurb blurb = makenbm.createLicense() ;