Attachment #191328 for bug #260774




    </target>

    <target name="library.designer.bundle" 
	    depends="library.designer.compile">
	    unless="qtjambi.library.cppfiles.uptodate">
        <jar destfile="${outputDir}/qtjambi-designer-${qtjambi.version}.jar"
             basedir="${outputDir}">
            <include name="com/trolltech/tools/designer/*"/>

    <target name="init"
        depends="init.ant, init.taskdef"
        description="Initializes the Qt Jambi build environment." >
      <qtjambi-initialize verbose="true" configuration="${qtjambi.config}"
			opengl="${gentoo.opengl}" phonon="${gentoo.phonon}"
			webkit="${gentoo.webkit}" xmlpatterns="${gentoo.xmlpatterns}"/>
    </target>

    <target name="generator"




        return configuration;
    }

    public void setOpengl(String opengl) {
	this.opengl = opengl;
    }

    public void setPhonon(String phonon) {
	this.phonon = phonon;
    }

    public void setWebkit(String webkit) {
	this.webkit = webkit;
    }

    public void setXmlpatterns(String xmlpatterns) {
	this.xmlpatterns = xmlpatterns;
    }

    public void execute() throws BuildException {
        props = PropertyHelper.getPropertyHelper(getProject());
        props.setNewProperty(null, OSNAME, decideOSName());

    }

    private String decideLibSubDir() {
        libSubDir = "";
        if (verbose) System.out.println("qtjambi.libsubdir: " + libSubDir);
        return libSubDir;
    }

        StringBuilder path = new StringBuilder();
        path.append(props.getProperty(null, QTDIR));
        path.append("/");
        path.append(props.getProperty(null, LIBSUBDIR));
        path.append("/");
        path.append(LibraryEntry.formatQtName(name, debug, version));
        return new File(path.toString()).exists();
    }

    }

    private String decidePhonon() {
        String result = phonon;
        if (verbose) System.out.println(PHONON + ": " + result);
        return result;
    }

    private String decideWebkit() {
        String result = webkit;
        if (verbose) System.out.println(WEBKIT + ": " + result);
        return result;
    }

    private String decideXMLPatterns() {
        String result = xmlpatterns;
        if (verbose) System.out.println(XMLPATTERNS + ": " + result);
        return result;
    }

    private String decideOpenGL() {
        String result = opengl;
        if (verbose) System.out.println(OPENGL + ": " + result);
        return result;
    }

    private String qmakespec;
    private String qtdir;
    private String libSubDir;
    private String opengl;
    private String phonon;
    private String webkit;
    private String xmlpatterns;
}

Return to bug 260774

Lines 293-300 Link Here

(-)qtjambi-src-preview-4.5.0_01~orig/build.xml (-3 / +4 lines)
293	</target>	293	</target>
294		294
295	<target name="library.designer.bundle"	295	<target name="library.designer.bundle"
296	depends="library.designer.compile"	296	depends="library.designer.compile">
297	unless="qtjambi.library.cppfiles.uptodate">
298	<jar destfile="${outputDir}/qtjambi-designer-${qtjambi.version}.jar"	297	<jar destfile="${outputDir}/qtjambi-designer-${qtjambi.version}.jar"
299	basedir="${outputDir}">	298	basedir="${outputDir}">
300	<include name="com/trolltech/tools/designer/*"/>	299	<include name="com/trolltech/tools/designer/*"/>
Lines 593-599 Link Here
593	<target name="init"	592	<target name="init"
594	depends="init.ant, init.taskdef"	593	depends="init.ant, init.taskdef"
595	description="Initializes the Qt Jambi build environment." >	594	description="Initializes the Qt Jambi build environment." >
596	<qtjambi-initialize verbose="true" configuration="${qtjambi.config}" />	595	<qtjambi-initialize verbose="true" configuration="${qtjambi.config}"
		596	opengl="${gentoo.opengl}" phonon="${gentoo.phonon}"
		597	webkit="${gentoo.webkit}" xmlpatterns="${gentoo.xmlpatterns}"/>
597	</target>	598	</target>
598		599
599	<target name="generator"	600	<target name="generator"

Lines 105-110 Link Here

(-)qtjambi-src-preview-4.5.0_01~orig/com/trolltech/tools/ant/InitializeTask.java (-7 / +25 lines)
105	return configuration;	105	return configuration;
106	}	106	}
107		107
		108	public void setOpengl(String opengl) {
		109	this.opengl = opengl;
		110	}
		111
		112	public void setPhonon(String phonon) {
		113	this.phonon = phonon;
		114	}
		115
		116	public void setWebkit(String webkit) {
		117	this.webkit = webkit;
		118	}
		119
		120	public void setXmlpatterns(String xmlpatterns) {
		121	this.xmlpatterns = xmlpatterns;
		122	}
		123
108	public void execute() throws BuildException {	124	public void execute() throws BuildException {
109	props = PropertyHelper.getPropertyHelper(getProject());	125	props = PropertyHelper.getPropertyHelper(getProject());
110	props.setNewProperty(null, OSNAME, decideOSName());	126	props.setNewProperty(null, OSNAME, decideOSName());
Lines 301-307 Link Here
301	}	317	}
302		318
303	private String decideLibSubDir() {	319	private String decideLibSubDir() {
304	libSubDir = OSInfo.os() == OSInfo.OS.Windows ? "bin" : "lib";	320	libSubDir = "";
305	if (verbose) System.out.println("qtjambi.libsubdir: " + libSubDir);	321	if (verbose) System.out.println("qtjambi.libsubdir: " + libSubDir);
306	return libSubDir;	322	return libSubDir;
307	}	323	}
Lines 330-337 Link Here
330	StringBuilder path = new StringBuilder();	346	StringBuilder path = new StringBuilder();
331	path.append(props.getProperty(null, QTDIR));	347	path.append(props.getProperty(null, QTDIR));
332	path.append("/");	348	path.append("/");
333	path.append(props.getProperty(null, LIBSUBDIR));
334	path.append("/");
335	path.append(LibraryEntry.formatQtName(name, debug, version));	349	path.append(LibraryEntry.formatQtName(name, debug, version));
336	return new File(path.toString()).exists();	350	return new File(path.toString()).exists();
337	}	351	}
Lines 353-377 Link Here
353	}	367	}
354		368
355	private String decidePhonon() {	369	private String decidePhonon() {
356	String result = String.valueOf(doesQtLibExist("phonon", 4));	370	String result = phonon;
357	if (verbose) System.out.println(PHONON + ": " + result);	371	if (verbose) System.out.println(PHONON + ": " + result);
358	return result;	372	return result;
359	}	373	}
360		374
361	private String decideWebkit() {	375	private String decideWebkit() {
362	String result = String.valueOf(doesQtLibExist("QtWebKit", 4));	376	String result = webkit;
363	if (verbose) System.out.println(WEBKIT + ": " + result);	377	if (verbose) System.out.println(WEBKIT + ": " + result);
364	return result;	378	return result;
365	}	379	}
366		380
367	private String decideXMLPatterns() {	381	private String decideXMLPatterns() {
368	String result = String.valueOf(doesQtLibExist("QtXmlPatterns", 4));	382	String result = xmlpatterns;
369	if (verbose) System.out.println(XMLPATTERNS + ": " + result);	383	if (verbose) System.out.println(XMLPATTERNS + ": " + result);
370	return result;	384	return result;
371	}	385	}
372		386
373	private String decideOpenGL() {	387	private String decideOpenGL() {
374	String result = String.valueOf(doesQtLibExist("QtOpenGL", 4));	388	String result = opengl;
375	if (verbose) System.out.println(OPENGL + ": " + result);	389	if (verbose) System.out.println(OPENGL + ": " + result);
376	return result;	390	return result;
377	}	391	}
Lines 385-388 Link Here
385	private String qmakespec;	399	private String qmakespec;
386	private String qtdir;	400	private String qtdir;
387	private String libSubDir;	401	private String libSubDir;
		402	private String opengl;
		403	private String phonon;
		404	private String webkit;
		405	private String xmlpatterns;
388	}	406	}