Commit c55614b170f6bdf344474616ae95a58ba22998de

added untested support to mac32


1	1	#!/bin/bash
2	2
3		for i in resources-linux32 resources-linux64 resources-win32 resources-win64; do
	3	for i in resources-linux32 resources-linux64 resources-win32 resources-win64 resources-mac32; do
4	4	rm -rf ${i}/src/main/resources
5	5	done


7	7	QTJAMBI_LINUX64_RELEASE=~/qtjambi/qtjambi-linux64-lgpl-4.5.2_01
8	8	QTJAMBI_WIN32_RELEASE=~/qtjambi/qtjambi-win32-lgpl-4.5.2_01
9	9	QTJAMBI_WIN64_RELEASE=~/qtjambi/qtjambi-win64-lgpl-4.5.2_01
10		QTJAMBI_MAC_RELEASE=
	10	QTJAMBI_MAC32_RELEASE=~/qtjambi/qtjambi-mac-lgpl-4.5.2_01
11	11
12	12	# Maven stuff
13	13	# TODO: this should be used as deploy-deploy file together with REPO in the future, now should stay install:install-file


1	1	#!/bin/bash
2	2
3		# TODO mac
4
5	3	source env_releases
6	4	source functions
7	5
…	…
21	21
22	22	for i in bin/juic.exe bin/lupdate.exe bin/lrelease.exe bin/QtCore4.dll bin/QtXml4.dll; do
23	23	cp ${QTJAMBI_WIN64_RELEASE}/${i} resources-win64/src/main/resources \|\| die
	24	done
	25
	26	for i in bin/juic bin/lupdate bin/lrelease lib/libQtCore.4.dylib lib/libQtXml.4.dylib; do
	27	cp ${QTJAMBI_MAC32_RELEASE}/${i} resources-mac32/src/main/resources \|\| die
24	28	done


7	7	# prepare poms
8	8	rm -rf tmp
9	9	mkdir -p tmp
10		for platform in linux32 linux64 win32 win64; do
	10	for platform in linux32 linux64 win32 win64 mac32; do
11	11	cat misc/qtjambi-base.pom \| sed s/%PLATFORM%/$platform/ \| sed s/%QTJAMBI_VERSION%/$QTJAMBI_VERSION/ > tmp/qtjambi-base-$platform.pom \|\| die
12	12	cat misc/qtjambi-platform.pom \| sed s/%PLATFORM%/$platform/ \| sed s/%QTJAMBI_VERSION%/$QTJAMBI_VERSION/ > tmp/qtjambi-$platform.pom \|\| die
13	13	done
…	…
27	27
28	28	mvn ${MAVEN_ACTION}:${MAVEN_SUBACTION} -Dfile=${QTJAMBI_WIN64_RELEASE}/qtjambi-${QTJAMBI_VERSION}.jar -DpomFile=qtjambi-base-win64.pom $MAVEN_REPO \|\| die
29	29	mvn ${MAVEN_ACTION}:${MAVEN_SUBACTION} -Dfile=${QTJAMBI_WIN64_RELEASE}/qtjambi-win64-msvc2005x64-${QTJAMBI_VERSION}.jar -DpomFile=qtjambi-win64.pom $MAVEN_REPO \|\| die
	30
	31	mvn ${MAVEN_ACTION}:${MAVEN_SUBACTION} -Dfile=${QTJAMBI_MAC32_RELEASE}/qtjambi-${QTJAMBI_VERSION}.jar -DpomFile=qtjambi-base-mac.pom $MAVEN_REPO \|\| die
	32	mvn ${MAVEN_ACTION}:${MAVEN_SUBACTION} -Dfile=${QTJAMBI_MAC32_RELEASE}/qtjambi-mac32-gcc-${QTJAMBI_VERSION}.jar -DpomFile=qtjambi-mac.pom $MAVEN_REPO \|\| die
30	33
31	34	cd ..
32	35	rm -rf tmp


138	138	</dependencies>
139	139	</profile>
140	140
	141	<profile>
	142	<id>mac32</id>
	143	<activation>
	144	<os>
	145	<family>mac</family>
	146	<arch>i386</arch>
	147	</os>
	148	</activation>
	149	<dependencies>
	150	<dependency>
	151	<groupId>net.sf.qtjambi</groupId>
	152	<artifactId>qtjambi-maven-plugin-mac32</artifactId>
	153	<version>%QTJAMBI_VERSION%</version>
	154	</dependency>
	155	</dependencies>
	156	</profile>
	157
141	158	</profiles>
142	159
143	160	</project>


147	147	platform = Platforms.LIN64;
148	148	tool_files = new String[]{"juic", "lupdate", "lrelease", "libQtCore.so.4", "libQtXml.so.4"};
149	149	} else if (platform_name.contains("mac") && platform_bits == 32) {
150		throw new MojoExecutionException("Platform mac32 not yet supported");
	150	platform = Platforms.MAC32;
	151	tool_files = new String[]{"juic", "lupdate", "lrelease", "libQtCore.4.dylib", "libQtXml.4.dylib"};
151	152	} else if (platform_name.contains("mac") && platform_bits == 64) {
152	153	throw new MojoExecutionException("Platform mac64 not yet supported");
153	154	} else {
…	…
383	383	// TODO what about mac?
384	384	if (platform.equals(Platforms.LIN32) \|\| platform.equals(Platforms.LIN64)) {
385	385	b.environment().put("LD_LIBRARY_PATH", binariesDir.getAbsolutePath());
	386	}
	387
	388	if (platform.equals(Platforms.MAC32) \|\| platform.equals(Platforms.MAC64)) {
	389	b.environment().put("DYLD_LIBRARY_PATH", binariesDir.getAbsolutePath());
386	390	}
387	391
388	392	// run process


17	17	<module>resources-win64</module>
18	18	<module>resources-linux32</module>
19	19	<module>resources-linux64</module>
	20	<module>resources-mac32</module>
20	21
21	22	<!-- this project is the main library what applications should use.
22	23	It handles dependency on qtjambi jars for each platform -->


105	105	</dependencies>
106	106	</profile>
107	107
	108	<profile>
	109	<id>mac32</id>
	110	<activation>
	111	<os>
	112	<name>Mac OS X</name>
	113	<family>mac</family>
	114	<arch>i386</arch>
	115	<!-- <version>5.1.2600</version> -->
	116	</os>
	117	</activation>
	118	<dependencies>
	119	<dependency>
	120	<groupId>net.sf.qtjambi</groupId>
	121	<artifactId>qtjambi-base-mac32</artifactId>
	122	<version>%QTJAMBI_VERSION%</version>
	123	</dependency>
	124	<dependency>
	125	<groupId>net.sf.qtjambi</groupId>
	126	<artifactId>qtjambi-platform-mac32</artifactId>
	127	<version>%QTJAMBI_VERSION%</version>
	128	</dependency>
	129	</dependencies>
	130	</profile>
	131
108	132	</profiles>
109	133
110	134	</project>