Fix scripts

This commit is contained in:
Victor Shcherb 2012-08-27 20:38:34 +02:00
parent 81cd2a6e98
commit 8994ba2fa6

View file

@ -23,25 +23,15 @@
declared in default.properties. declared in default.properties.
--> -->
<target name="-package-resources" depends="-crunch"> <target name="-package-resources" depends="-crunch">
<aapt executable="${aapt}" <!-- only package resources if *not* a library project -->
command="package" <do-only-if-not-library elseText="Library project: do not package resources...">
versioncode="${version.code}" <aapt executable="${aapt}" command="package" versioncode="${version.code}" versionname="${version.name}" debug="${build.is.packaging.debug}" manifest="${out.manifest.abs.file}" assets="${asset.absolute.dir}" androidjar="${project.target.android.jar}" apkfolder="${out.absolute.dir}" nocrunch="${build.packaging.nocrunch}" resourcefilename="${resource.package.file.name}" resourcefilter="${aapt.resource.filter}" libraryResFolderPathRefid="project.library.res.folder.path" libraryPackagesRefid="project.library.packages" previousBuildType="${build.last.target}" buildType="${build.target}" ignoreAssets="${aapt.ignore.assets}">
versionname="${version.name}" <res path="${out.res.absolute.dir}" />
debug="${build.is.packaging.debug}" <res path="${resource.absolute.dir}" />
manifest="AndroidManifest.xml" <!-- <nocompress /> forces no compression on any files in assets or res/raw -->
assets="${asset.absolute.dir}" <!-- <nocompress extension="xml" /> forces no compression on specific file extensions in assets and res/raw -->
androidjar="${android.jar}" </aapt>
apkfolder="${out.absolute.dir}" </do-only-if-not-library>
nocrunch="${build.packaging.nocrunch}"
resourcefilename="${resource.package.file.name}"
resourcefilter="${aapt.resource.filter}"
projectLibrariesResName="project.libraries.res"
projectLibrariesPackageName="project.libraries.package"
previousBuildType="${build.last.target}"
buildType="${build.target}">
<res path="${out.res.absolute.dir}" />
<res path="${resource.absolute.dir}" />
</aapt>
<!-- osmchange --> <!-- osmchange -->
<echo>Packaging aditional OsmAnd resources and assets... to ${out.packaged.file} from ${raw.absolute.dir}</echo> <echo>Packaging aditional OsmAnd resources and assets... to ${out.packaged.file} from ${raw.absolute.dir}</echo>
@ -158,17 +148,17 @@
<src path="${source.absolute.dir}" /> <src path="${source.absolute.dir}" />
<src path="${gen.absolute.dir}" /> <src path="${gen.absolute.dir}" />
<compilerarg line="${java.compilerargs}" /> <compilerarg line="${java.compilerargs}" />
<!-- osmchange --> <!-- osmchange -->
<src path="${use.absolute.dir}" /> <src path="${use.absolute.dir}" />
<exclude name="**/LogUtil.java" /> <exclude name="**/LogUtil.java" />
<exclude name="**/OsmStorageWriter.java" /> <exclude name="**/OsmStorageWriter.java" />
<exclude name="**/net/osmand/data/index/" /> <exclude name="**/net/osmand/data/index/" />
<exclude name="**/net/osmand/data/preparation/" /> <exclude name="**/net/osmand/data/preparation/" />
<exclude name="**/net/osmand/osm/util/" /> <exclude name="**/net/osmand/osm/util/" />
<exclude name="**/net/osmand/swing/" /> <exclude name="**/net/osmand/swing/" />
<exclude name="**/net/osmand/router/test/" /> <exclude name="**/net/osmand/router/test/" />
<exclude name="**/resources/" /> <exclude name="**/resources/" />
<exclude name="**/rtree/" /> <exclude name="**/rtree/" />
<!-- osmchange --> <!-- osmchange -->
</javac> </javac>