diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-23 17:54:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-23 17:55:40 +0200 |
| commit | 82b5fcca3ef7a7180b861687c97ace8c77e38acf (patch) | |
| tree | feab3fd28d9c281104220880f66f5482a76af235 /scp2/source | |
| parent | a66f9903bba9dc7eeff6683ebddcd34d4ad70068 (diff) | |
Undo basis/brand split: move testtool from basis to brand.
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/testtool/file_testtool.scp | 17 | ||||
| -rw-r--r-- | scp2/source/testtool/module_testtool.scp | 1 |
2 files changed, 2 insertions, 16 deletions
diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp index 4592f1dd05e1..703de8ff39da 100644 --- a/scp2/source/testtool/file_testtool.scp +++ b/scp2/source/testtool/file_testtool.scp @@ -32,7 +32,7 @@ STD_LIB_FILE( gid_File_Lib_Simplecm, simplecm ) File gid_File_Bin_Testtool BIN_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); #if defined WNT Name = "testtool.exe"; @@ -43,7 +43,7 @@ End File gid_File_Config_Testtool BIN_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); #ifdef UNX Name = "testtoolrc"; @@ -51,16 +51,3 @@ File gid_File_Config_Testtool Name = "testtool.ini"; #endif End - -// On Mac OS X, testtool needs to find the Info.plist and needs to be located in -// the Content/MacOS directory; since the Mac OS X dmg contains all layers, -// anyway, this hack works for now: -#if defined MACOSX -Unixlink gid_Unixlink_Testtool - BIN_FILE_BODY; - Styles = (); - Name = "testtool"; - Dir = gid_Brand_Dir_Program; - Target = "../basis-link/program/testtool"; -End -#endif diff --git a/scp2/source/testtool/module_testtool.scp b/scp2/source/testtool/module_testtool.scp index a608d9140f2b..2f4c4453f5d2 100644 --- a/scp2/source/testtool/module_testtool.scp +++ b/scp2/source/testtool/module_testtool.scp @@ -34,5 +34,4 @@ Module gid_Module_Optional_Testtool ParentID = gid_Module_Optional; Default = NO; Files = (gid_File_Bin_Testtool, gid_File_Lib_Communi, gid_File_Lib_Simplecm, gid_File_Hid_Testtool, gid_File_Config_Testtool); - Unixlinks = (gid_Unixlink_Testtool); End |