summaryrefslogtreecommitdiffstats
path: root/scp2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-02-27 01:29:42 +0100
committerMichael Stahl <mstahl@redhat.com>2013-02-27 01:33:19 +0100
commit9b16031c5e3197bf685703bf236e53b5910b4f70 (patch)
treea109a2bd13be4115fd0fac2563a1633c08c924b4 /scp2
parentstore: new ZipPackage_store_odk_headers (diff)
downloadcore-9b16031c5e3197bf685703bf236e53b5910b4f70.tar.gz
core-9b16031c5e3197bf685703bf236e53b5910b4f70.zip
odk, scp2: remove the horribly broken "find" in CustomTarget_include
... and instead bundle the *_odk_headers zip files. Change-Id: Ice86f8e22d3a6fa46f7cee38193dffdd0479d491
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/sdkoo/module_sdkoo.scp9
-rw-r--r--scp2/source/sdkoo/sdkoo.scp49
2 files changed, 57 insertions, 1 deletions
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index b24bd7aafd50..732388c86739 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -33,5 +33,12 @@ Module gid_Module_Optional_Sdkoo
Sortkey = "630";
ParentID = gid_Module_Optional;
Default = NO;
- Files = (gid_File_Zip_Odkexamples, gid_File_Zip_Odkcommon);
+ Files = (gid_File_Zip_Odkexamples, gid_File_Zip_Odkcommon,
+ gid_File_Zip_Odkheaders_sal_generated,
+ gid_File_Zip_Odkheaders_sal,
+ gid_File_Zip_Odkheaders_salhelper,
+ gid_File_Zip_Odkheaders_cppu,
+ gid_File_Zip_Odkheaders_cppuhelper,
+ gid_File_Zip_Odkheaders_store,
+ gid_File_Zip_Odkheaders_registry);
End
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 88eb508a5f43..02dc53672cd7 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -131,6 +131,55 @@ File gid_File_Zip_Odkcommon
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
End
+File gid_File_Zip_Odkheaders_sal_generated
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "sal_generated.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_sal
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "sal_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_salhelper
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "salhelper_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_cppu
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "cppu_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_cppuhelper
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "cppuhelper_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_store
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "store_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Zip_Odkheaders_registry
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "registry_odk_headers.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+
#if (!defined(WNT) && !defined( MACOSX) )
Directory gid_Dir_Lib_Sdk
Styles = (CREATE);