Attachment #188929 for bug #260774




        this.configuration = configuration;
    }

    public void setQtdir(String qtdir) {
	this.qtdir = qtdir;
    }

    public String getConfiguration() {
        return configuration;
    }

    public void setSqlite(String sqlite) {
	this.sqlite = sqlite;
    }

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

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

    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 decideQtDir() {
        //qtdir = System.getenv("QTDIR");
        if (qtdir == null)
            throw new BuildException("QTDIR environment variable missing");
        if (!new File(qtdir).exists())

        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 decideSqlite() {
        //String result = String.valueOf(doesQtPluginExist("qsqlite", "sqldrivers"));
	String result = sqlite;
        if (verbose) System.out.println(SQLITE + ": " + result);
        return result;
    }

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

    private String decideWebkit() {
        //String result = String.valueOf(doesQtLibExist("QtWebKit", 4));
	String result = webkit;
        if (verbose) System.out.println(WEBKIT + ": " + result);
        return result;
    }

    private String decideXMLPatterns() {
        //String result = String.valueOf(doesQtLibExist("QtXmlPatterns", 4));
	String result = xmlpatterns;
        if (verbose) System.out.println(XMLPATTERNS + ": " + result);
        return result;
    }

    private String decideOpenGL() {
        //String result = String.valueOf(doesQtLibExist("QtOpenGL", 4));
	String result = opengl;
        if (verbose) System.out.println(OPENGL + ": " + result);
        return result;
    }

    private PropertyHelper props;
    private String configuration;
    private boolean debug;
    private String sqlite;
    private String phonon;
    private String xmlpatterns;
    private String webkit;
    private String opengl;
    private String qmakespec;
    private String qtdir;
    private String libSubDir;




    </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}"
				qtdir="${gentoo.qtdir}" phonon="${gentoo.phonon}" 
				webkit="${gentoo.webkit}" opengl="${gentoo.opengl}"
				sqlite="${gentoo.sqlite}" xmlpatterns="${gentoo.xmlpatterns}" />

    </target>

    <target name="generator"

Return to bug 260774

Lines 101-110 public class InitializeTask extends Task Link Here

(-)qtjambi-src-preview-4.5.0_01/com/trolltech/tools/ant/InitializeTask.java (-8 / +42 lines)
101	this.configuration = configuration;	101	this.configuration = configuration;
102	}	102	}
103		103
		104	public void setQtdir(String qtdir) {
		105	this.qtdir = qtdir;
		106	}
		107
104	public String getConfiguration() {	108	public String getConfiguration() {
105	return configuration;	109	return configuration;
106	}	110	}
107		111
		112	public void setSqlite(String sqlite) {
		113	this.sqlite = sqlite;
		114	}
		115
		116	public void setPhonon(String phonon) {
		117	this.phonon = phonon;
		118	}
		119
		120	public void setOpengl(String opengl) {
		121	this.opengl = opengl;
		122	}
		123
		124	public void setWebkit(String webkit) {
		125	this.webkit = webkit;
		126	}
		127
		128	public void setXmlpatterns(String xmlpatterns) {
		129	this.xmlpatterns = xmlpatterns;
		130	}
		131
108	public void execute() throws BuildException {	132	public void execute() throws BuildException {
109	props = PropertyHelper.getPropertyHelper(getProject());	133	props = PropertyHelper.getPropertyHelper(getProject());
110	props.setNewProperty(null, OSNAME, decideOSName());	134	props.setNewProperty(null, OSNAME, decideOSName());
Lines 307-313 public class InitializeTask extends Task Link Here
307	}	331	}
308		332
309	private String decideQtDir() {	333	private String decideQtDir() {
310	qtdir = System.getenv("QTDIR");	334	//qtdir = System.getenv("QTDIR");
311	if (qtdir == null)	335	if (qtdir == null)
312	throw new BuildException("QTDIR environment variable missing");	336	throw new BuildException("QTDIR environment variable missing");
313	if (!new File(qtdir).exists())	337	if (!new File(qtdir).exists())
Lines 330-337 public class InitializeTask extends Task Link Here
330	StringBuilder path = new StringBuilder();	354	StringBuilder path = new StringBuilder();
331	path.append(props.getProperty(null, QTDIR));	355	path.append(props.getProperty(null, QTDIR));
332	path.append("/");	356	path.append("/");
333	path.append(props.getProperty(null, LIBSUBDIR));	357	//path.append(props.getProperty(null, LIBSUBDIR));
334	path.append("/");	358	//path.append("/");
335	path.append(LibraryEntry.formatQtName(name, debug, version));	359	path.append(LibraryEntry.formatQtName(name, debug, version));
336	return new File(path.toString()).exists();	360	return new File(path.toString()).exists();
337	}	361	}
Lines 347-377 public class InitializeTask extends Task Link Here
347	}	371	}
348		372
349	private String decideSqlite() {	373	private String decideSqlite() {
350	String result = String.valueOf(doesQtPluginExist("qsqlite", "sqldrivers"));	374	//String result = String.valueOf(doesQtPluginExist("qsqlite", "sqldrivers"));
		375	String result = sqlite;
351	if (verbose) System.out.println(SQLITE + ": " + result);	376	if (verbose) System.out.println(SQLITE + ": " + result);
352	return result;	377	return result;
353	}	378	}
354		379
355	private String decidePhonon() {	380	private String decidePhonon() {
356	String result = String.valueOf(doesQtLibExist("phonon", 4));	381	//String result = String.valueOf(doesQtLibExist("phonon", 4));
		382	String result = phonon;
357	if (verbose) System.out.println(PHONON + ": " + result);	383	if (verbose) System.out.println(PHONON + ": " + result);
358	return result;	384	return result;
359	}	385	}
360		386
361	private String decideWebkit() {	387	private String decideWebkit() {
362	String result = String.valueOf(doesQtLibExist("QtWebKit", 4));	388	//String result = String.valueOf(doesQtLibExist("QtWebKit", 4));
		389	String result = webkit;
363	if (verbose) System.out.println(WEBKIT + ": " + result);	390	if (verbose) System.out.println(WEBKIT + ": " + result);
364	return result;	391	return result;
365	}	392	}
366		393
367	private String decideXMLPatterns() {	394	private String decideXMLPatterns() {
368	String result = String.valueOf(doesQtLibExist("QtXmlPatterns", 4));	395	//String result = String.valueOf(doesQtLibExist("QtXmlPatterns", 4));
		396	String result = xmlpatterns;
369	if (verbose) System.out.println(XMLPATTERNS + ": " + result);	397	if (verbose) System.out.println(XMLPATTERNS + ": " + result);
370	return result;	398	return result;
371	}	399	}
372		400
373	private String decideOpenGL() {	401	private String decideOpenGL() {
374	String result = String.valueOf(doesQtLibExist("QtOpenGL", 4));	402	//String result = String.valueOf(doesQtLibExist("QtOpenGL", 4));
		403	String result = opengl;
375	if (verbose) System.out.println(OPENGL + ": " + result);	404	if (verbose) System.out.println(OPENGL + ": " + result);
376	return result;	405	return result;
377	}	406	}
Lines 382-387 public class InitializeTask extends Task Link Here
382	private PropertyHelper props;	411	private PropertyHelper props;
383	private String configuration;	412	private String configuration;
384	private boolean debug;	413	private boolean debug;
		414	private String sqlite;
		415	private String phonon;
		416	private String xmlpatterns;
		417	private String webkit;
		418	private String opengl;
385	private String qmakespec;	419	private String qmakespec;
386	private String qtdir;	420	private String qtdir;
387	private String libSubDir;	421	private String libSubDir;

Lines 293-300 Link Here

(-)qtjambi-src-preview-4.5.0_01/build.xml (-3 / +6 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	qtdir="${gentoo.qtdir}" phonon="${gentoo.phonon}"
		597	webkit="${gentoo.webkit}" opengl="${gentoo.opengl}"
		598	sqlite="${gentoo.sqlite}" xmlpatterns="${gentoo.xmlpatterns}" />
		599
597	</target>	600	</target>
598		601
599	<target name="generator"	602	<target name="generator"