Undo basis/brand split: move testtool from basis to brand.

Repository.mk

@@ -48,6 +48,9 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 
 $(eval $(call gb_Helper_register_executables,OOO, \
     spadmin.bin \
+))
+
+$(eval $(call gb_Helper_register_executables,BRAND,\
     testtool \
 ))
 

automation/source/testtool/testtool.ini

 [Bootstrap]
-URE_BOOTSTRAP=${ORIGIN}/fundamentalbasis!INIFILESUFFIX!
-OOO_BASE_DIR=${ORIGIN}/..
-BRAND_BASE_DIR=${OOO_BASE_DIR}/!BRANDPATH!
+URE_BOOTSTRAP=${ORIGIN}/fundamental!INIFILESUFFIX!
 UserInstallation=${SYSUSERCONFIG}/.oootesttool
 
 [Misc]

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

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