Attachment #175746 for bug #251500




        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;

Lines 425-431 Link Here

(-)qtjambi-src-gpl-4.4.3_01/build.xml (-1 / +3 lines)
425	<target name="init"	425	<target name="init"
426	depends="init.ant, init.taskdef"	426	depends="init.ant, init.taskdef"
427	description="Initializes the Qt Jambi build environment." >	427	description="Initializes the Qt Jambi build environment." >
428	<qtjambi-initialize verbose="true" configuration="${qtjambi.config}" />	428	<qtjambi-initialize verbose="true" configuration="${qtjambi.config}" qtdir="${gentoo.qtdir}" phonon="${gentoo.phonon}" webkit="${gentoo.webkit}"
		429	opengl="${gentoo.opengl}"
		430	sqlite="${gentoo.sqlite}" xmlpatterns="${gentoo.xmlpatterns}" />
429	</target>	431	</target>
430		432
431	<target name="generator"	433	<target name="generator"

Return to bug 251500

Lines 120-129 public class InitializeTask extends Task Link Here

(-)qtjambi-src-gpl-4.4.3_01/com/trolltech/tools/ant/InitializeTask.java (-8 / +42 lines)
120	this.configuration = configuration;	120	this.configuration = configuration;
121	}	121	}
122		122
		123	public void setQtdir(String qtdir) {
		124	this.qtdir = qtdir;
		125	}
		126
123	public String getConfiguration() {	127	public String getConfiguration() {
124	return configuration;	128	return configuration;
125	}	129	}
126		130
		131	public void setSqlite(String sqlite) {
		132	this.sqlite = sqlite;
		133	}
		134
		135	public void setPhonon(String phonon) {
		136	this.phonon = phonon;
		137	}
		138
		139	public void setOpengl(String opengl) {
		140	this.opengl = opengl;
		141	}
		142
		143	public void setWebkit(String webkit) {
		144	this.webkit = webkit;
		145	}
		146
		147	public void setXmlpatterns(String xmlpatterns) {
		148	this.xmlpatterns = xmlpatterns;
		149	}
		150
127	public void execute() throws BuildException {	151	public void execute() throws BuildException {
128	props = PropertyHelper.getPropertyHelper(getProject());	152	props = PropertyHelper.getPropertyHelper(getProject());
129	props.setNewProperty(null, OSNAME, decideOSName());	153	props.setNewProperty(null, OSNAME, decideOSName());
Lines 323-329 public class InitializeTask extends Task Link Here
323	}	347	}
324		348
325	private String decideQtDir() {	349	private String decideQtDir() {
326	qtdir = System.getenv("QTDIR");	350	//qtdir = System.getenv("QTDIR");
327	if (qtdir == null)	351	if (qtdir == null)
328	throw new BuildException("QTDIR environment variable missing");	352	throw new BuildException("QTDIR environment variable missing");
329	if (!new File(qtdir).exists())	353	if (!new File(qtdir).exists())
Lines 346-353 public class InitializeTask extends Task Link Here
346	StringBuilder path = new StringBuilder();	370	StringBuilder path = new StringBuilder();
347	path.append(props.getProperty(null, QTDIR));	371	path.append(props.getProperty(null, QTDIR));
348	path.append("/");	372	path.append("/");
349	path.append(props.getProperty(null, LIBSUBDIR));	373	//path.append(props.getProperty(null, LIBSUBDIR));
350	path.append("/");	374	//path.append("/");
351	path.append(LibraryEntry.formatQtName(name, debug, version));	375	path.append(LibraryEntry.formatQtName(name, debug, version));
352	return new File(path.toString()).exists();	376	return new File(path.toString()).exists();
353	}	377	}
Lines 363-393 public class InitializeTask extends Task Link Here
363	}	387	}
364		388
365	private String decideSqlite() {	389	private String decideSqlite() {
366	String result = String.valueOf(doesQtPluginExist("qsqlite", "sqldrivers"));	390	//String result = String.valueOf(doesQtPluginExist("qsqlite", "sqldrivers"));
		391	String result = sqlite;
367	if (verbose) System.out.println(SQLITE + ": " + result);	392	if (verbose) System.out.println(SQLITE + ": " + result);
368	return result;	393	return result;
369	}	394	}
370		395
371	private String decidePhonon() {	396	private String decidePhonon() {
372	String result = String.valueOf(doesQtLibExist("phonon", 4));	397	//String result = String.valueOf(doesQtLibExist("phonon", 4));
		398	String result = phonon;
373	if (verbose) System.out.println(PHONON + ": " + result);	399	if (verbose) System.out.println(PHONON + ": " + result);
374	return result;	400	return result;
375	}	401	}
376		402
377	private String decideWebkit() {	403	private String decideWebkit() {
378	String result = String.valueOf(doesQtLibExist("QtWebKit", 4));	404	//String result = String.valueOf(doesQtLibExist("QtWebKit", 4));
		405	String result = webkit;
379	if (verbose) System.out.println(WEBKIT + ": " + result);	406	if (verbose) System.out.println(WEBKIT + ": " + result);
380	return result;	407	return result;
381	}	408	}
382		409
383	private String decideXMLPatterns() {	410	private String decideXMLPatterns() {
384	String result = String.valueOf(doesQtLibExist("QtXmlPatterns", 4));	411	//String result = String.valueOf(doesQtLibExist("QtXmlPatterns", 4));
		412	String result = xmlpatterns;
385	if (verbose) System.out.println(XMLPATTERNS + ": " + result);	413	if (verbose) System.out.println(XMLPATTERNS + ": " + result);
386	return result;	414	return result;
387	}	415	}
388		416
389	private String decideOpenGL() {	417	private String decideOpenGL() {
390	String result = String.valueOf(doesQtLibExist("QtOpenGL", 4));	418	//String result = String.valueOf(doesQtLibExist("QtOpenGL", 4));
		419	String result = opengl;
391	if (verbose) System.out.println(OPENGL + ": " + result);	420	if (verbose) System.out.println(OPENGL + ": " + result);
392	return result;	421	return result;
393	}	422	}
Lines 398-403 public class InitializeTask extends Task Link Here
398	private PropertyHelper props;	427	private PropertyHelper props;
399	private String configuration;	428	private String configuration;
400	private boolean debug;	429	private boolean debug;
		430	private String sqlite;
		431	private String phonon;
		432	private String xmlpatterns;
		433	private String webkit;
		434	private String opengl;
401	private String qmakespec;	435	private String qmakespec;
402	private String qtdir;	436	private String qtdir;
403	private String libSubDir;	437	private String libSubDir;