diff --git a/src/tests/Jamfile b/src/tests/Jamfile index 9d896da726..ae957e8c63 100644 --- a/src/tests/Jamfile +++ b/src/tests/Jamfile @@ -13,7 +13,7 @@ UnitTestLib libexampletest.so UnitTest UnitTester : UnitTester.cpp : be [ TargetLibstdc++ ] - : UnitTester.rsrc + : UnitTester.rdef ; # Install libbe and other libraries for target platform libbe_test. diff --git a/src/tests/UnitTester.rdef b/src/tests/UnitTester.rdef new file mode 100644 index 0000000000..7213f4ff5a --- /dev/null +++ b/src/tests/UnitTester.rdef @@ -0,0 +1,14 @@ +resource app_flags B_MULTIPLE_LAUNCH; + +resource(2, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-elfexecutable"; + +resource(246, "res_image") #'bits' array { + $"89504E470D0A1A0A0000000D4948445200000180000001210803000001365EB7" + $"5000000003504C54453366984C24B144000000096F4646730000000000000000" + $"00DA2AB6CE000000097048597300000FA000000FA001A06A8C77000000834944" + $"4154789CEDC13101000000C2A0F54F6D085FA000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"0000000000000000000000000000000000000000000000000000000000000000" + $"000000000000000000000000000000000000000000000000000000000000003E" + $"03B3AF00015BA7684D0000000049454E44AE426082" +}; diff --git a/src/tests/UnitTester.rsrc b/src/tests/UnitTester.rsrc deleted file mode 100644 index e47a8d13ec..0000000000 Binary files a/src/tests/UnitTester.rsrc and /dev/null differ diff --git a/src/tests/add-ons/print/ppd/test/Jamfile b/src/tests/add-ons/print/ppd/test/Jamfile index e04a24cb86..3edd81139c 100644 --- a/src/tests/add-ons/print/ppd/test/Jamfile +++ b/src/tests/add-ons/print/ppd/test/Jamfile @@ -1,24 +1,20 @@ SubDir HAIKU_TOP src tests add-ons print ppd test ; -# SetSubDirSupportedPlatformsBeOSCompatible ; - SubDirHdrs $(HAIKU_TOP) src tests add-ons print ppd model ; SubDirHdrs $(HAIKU_TOP) src tests add-ons print ppd parser ; SubDirHdrs $(HAIKU_TOP) src tests add-ons print ppd ui ; -# TODO convert .rsrc to .rdef -# AddResources PPDConfig : PPDConfigApplication.rsrc ; +AddResources PPDConfig : PPDConfigApplication.rdef ; -SimpleTest PPDConfig : +SimpleTest PPDConfig : PPDConfigApplication.cpp : be root libppdtest.a [ TargetLibsupc++ ] ; -SimpleTest PPDTest : +SimpleTest PPDTest : Test.cpp TestParser.cpp TestScanner.cpp - : + : be root libppdtest.a [ TargetLibsupc++ ] ; - diff --git a/src/tests/add-ons/print/ppd/test/PPDConfigApplication.rdef b/src/tests/add-ons/print/ppd/test/PPDConfigApplication.rdef new file mode 100644 index 0000000000..38082039ee --- /dev/null +++ b/src/tests/add-ons/print/ppd/test/PPDConfigApplication.rdef @@ -0,0 +1,69 @@ +resource app_flags B_SINGLE_LAUNCH; + +resource app_signature "application/x-vnd.application"; + +resource app_version { + major = 0, + middle = 0, + minor = 0, + + variety = B_APPV_DEVELOPMENT, + internal = 0, + + short_info = "Application", + long_info = "PPD Config" +}; + +resource large_icon array { + $"FFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFF001B1C1B0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FF003F1B1C1B1C1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FF0015153F1B1C1B1C1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FF00150A16153F3F1B1C1B1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FF00150A0B0B15153F1B1C1B1C1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FF00150A0B3F0B0A16153F1B1C1B1C1C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F0B0A16153F3F1B1C1B1C0000FFFFFFFFFFFFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F0B0A16153F3F1B1C1B1C0000FFFFFFFFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F0B0A16153F3F1B1C1B1C0000FFFFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F3F3F0A0B15153F3F1B1C1B3F00FFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F3F3F3F3F0A0B15163F3F3F0E00FFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F3F3F3F3F3F3F0B0B15150F0F00FFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F3F3F3F3F3F3F3F1B16150F0F29FFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F3F3F3F3F3F3F3F1B16150F0F29FFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F3F3F3F3F3F3F3F1C15150F0F00FFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F3F3F3F3F3F3F3F1C15150F0F00FFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F3F3F3F3F3F3F3F1C16150F0F01FFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F3F3F3F3F3F3F3F1C16150F0F01FFFFFFFFFFFFFF" + $"FF00150A0B3F3F3F3F3F3F3F3F3F3F3F3F3F3F1C16150F0F01FFFFFFFFFFFFFF" + $"FF00150A0B1C3F3F3F3F3F3F3F3F3F3F3F3F3F1C15160F0E00FFFFFFFFFFFFFF" + $"FF0015150B1B1C1C3F3F3F3F3F3F3F3F3F3F3F1C15140F0F00FFFFFFFFFFFFFF" + $"FF11000015151C1B1C1C3F3F3F3F3F3F3F3F3F1C15150F0F00FFFFFFFFFFFFFF" + $"FFFF1111000015151C1B1C1C3F3F3F3F3F3F3F1C15160F1000FFFFFFFFFFFFFF" + $"FFFFFFFF1111000015151C1B1C1C3F3F3F3F3F1C15150F0F001111FFFFFFFFFF" + $"FFFFFFFFFFFF1111000015151C1B1C1C3F3F3F1C15150F0F0011111111FFFFFF" + $"FFFFFFFFFFFFFFFF1111000015151C1B1C1C3F1B15160F0E00111111111111FF" + $"FFFFFFFFFFFFFFFFFFFF1111000015151C1B1C1C15150F0F001111111111FFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFF1111000015151C1B16150F0F0011111111FFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFF11110000151515160E0F00111111FFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1111000015150F00111111FFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1111000000111111FFFFFFFFFFFF" +}; + +resource mini_icon array { + $"FF000000FFFFFFFFFFFFFFFFFFFFFFFF" + $"00151B1C0000FFFFFFFFFFFFFFFFFFFF" + $"00150A161B1C0000FFFFFFFFFFFFFFFF" + $"00150A3F0B151C1C0000FFFFFFFFFFFF" + $"00150A3F3F3F0B151C1C0000FFFFFFFF" + $"00150A3F3F3F3F0A0B151C0F00FFFFFF" + $"00150A3F3F3F3F3F3F0A160E00FFFFFF" + $"00150A3F3F3F3F3F3F1C150F00FFFFFF" + $"00150A3F3F3F3F3F3F1B150F00FFFFFF" + $"00150A3F3F3F3F3F3F1B150F00FFFFFF" + $"00150A1C1C3F3F3F3F1B150F00FFFFFF" + $"11000015151C1B3F3F1C150F00FFFFFF" + $"FFFF11000015151C1B1C150F001111FF" + $"FFFFFFFF11000015151C150F00111111" + $"FFFFFFFFFFFF11000015150F001111FF" + $"FFFFFFFFFFFFFFFF110000001111FFFF" +}; diff --git a/src/tests/add-ons/print/ppd/test/PPDConfigApplication.rsrc b/src/tests/add-ons/print/ppd/test/PPDConfigApplication.rsrc deleted file mode 100644 index 681796520d..0000000000 Binary files a/src/tests/add-ons/print/ppd/test/PPDConfigApplication.rsrc and /dev/null differ diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp1.rdef b/src/tests/kits/app/bapplication/testapps/AppRunTestApp1.rdef new file mode 100644 index 0000000000..4a09712970 --- /dev/null +++ b/src/tests/kits/app/bapplication/testapps/AppRunTestApp1.rdef @@ -0,0 +1,17 @@ +resource app_flags B_MULTIPLE_LAUNCH | B_ARGV_ONLY; + +resource app_signature "application/x-vnd.obos-app-run-testapp1"; + +resource app_version { + major = 0, + middle = 0, + minor = 0, + + variety = B_APPV_DEVELOPMENT, + internal = 0, + + short_info = "TestApp1", + long_info = "TestApp1" +}; + +resource(2, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-elfexecutable"; diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp1.rsrc b/src/tests/kits/app/bapplication/testapps/AppRunTestApp1.rsrc deleted file mode 100644 index 5e9cb6ed40..0000000000 Binary files a/src/tests/kits/app/bapplication/testapps/AppRunTestApp1.rsrc and /dev/null differ diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp2.rdef b/src/tests/kits/app/bapplication/testapps/AppRunTestApp2.rdef new file mode 100644 index 0000000000..a74f41d1ad --- /dev/null +++ b/src/tests/kits/app/bapplication/testapps/AppRunTestApp2.rdef @@ -0,0 +1,17 @@ +resource app_flags B_MULTIPLE_LAUNCH; + +resource app_signature "application/x-vnd.obos-app-run-testapp1"; + +resource app_version { + major = 0, + middle = 0, + minor = 0, + + variety = B_APPV_DEVELOPMENT, + internal = 0, + + short_info = "TestApp2", + long_info = "TestApp2" +}; + +resource(2, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-elfexecutable"; diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp2.rsrc b/src/tests/kits/app/bapplication/testapps/AppRunTestApp2.rsrc deleted file mode 100644 index cdda562a32..0000000000 Binary files a/src/tests/kits/app/bapplication/testapps/AppRunTestApp2.rsrc and /dev/null differ diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp3.rdef b/src/tests/kits/app/bapplication/testapps/AppRunTestApp3.rdef new file mode 100644 index 0000000000..ecc57de5fe --- /dev/null +++ b/src/tests/kits/app/bapplication/testapps/AppRunTestApp3.rdef @@ -0,0 +1,17 @@ +resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; + +resource app_signature "application/x-vnd.obos-app-run-testapp1"; + +resource app_version { + major = 0, + middle = 0, + minor = 0, + + variety = B_APPV_DEVELOPMENT, + internal = 0, + + short_info = "TestApp3", + long_info = "TestApp3" +}; + +resource(2, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-elfexecutable"; diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp3.rsrc b/src/tests/kits/app/bapplication/testapps/AppRunTestApp3.rsrc deleted file mode 100644 index 63c803d1dc..0000000000 Binary files a/src/tests/kits/app/bapplication/testapps/AppRunTestApp3.rsrc and /dev/null differ diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp4.rdef b/src/tests/kits/app/bapplication/testapps/AppRunTestApp4.rdef new file mode 100644 index 0000000000..fe15f51573 --- /dev/null +++ b/src/tests/kits/app/bapplication/testapps/AppRunTestApp4.rdef @@ -0,0 +1,17 @@ +resource app_flags B_SINGLE_LAUNCH; + +resource app_signature "application/x-vnd.obos-app-run-testapp1"; + +resource app_version { + major = 0, + middle = 0, + minor = 0, + + variety = B_APPV_DEVELOPMENT, + internal = 0, + + short_info = "TestApp4", + long_info = "TestApp4" +}; + +resource(2, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-elfexecutable"; diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp4.rsrc b/src/tests/kits/app/bapplication/testapps/AppRunTestApp4.rsrc deleted file mode 100644 index f7428f5738..0000000000 Binary files a/src/tests/kits/app/bapplication/testapps/AppRunTestApp4.rsrc and /dev/null differ diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp5.rdef b/src/tests/kits/app/bapplication/testapps/AppRunTestApp5.rdef new file mode 100644 index 0000000000..55e0e13e30 --- /dev/null +++ b/src/tests/kits/app/bapplication/testapps/AppRunTestApp5.rdef @@ -0,0 +1,17 @@ +resource app_flags B_EXCLUSIVE_LAUNCH | B_ARGV_ONLY; + +resource app_signature "application/x-vnd.obos-app-run-testapp1"; + +resource app_version { + major = 0, + middle = 0, + minor = 0, + + variety = B_APPV_DEVELOPMENT, + internal = 0, + + short_info = "TestApp1", + long_info = "TestApp1" +}; + +resource(2, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-elfexecutable"; diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp5.rsrc b/src/tests/kits/app/bapplication/testapps/AppRunTestApp5.rsrc deleted file mode 100644 index 68f33717f4..0000000000 Binary files a/src/tests/kits/app/bapplication/testapps/AppRunTestApp5.rsrc and /dev/null differ diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp6.rdef b/src/tests/kits/app/bapplication/testapps/AppRunTestApp6.rdef new file mode 100644 index 0000000000..41f29721cd --- /dev/null +++ b/src/tests/kits/app/bapplication/testapps/AppRunTestApp6.rdef @@ -0,0 +1,17 @@ +resource app_flags B_EXCLUSIVE_LAUNCH; + +resource app_signature "application/x-vnd.obos-app-run-testapp1"; + +resource app_version { + major = 0, + middle = 0, + minor = 0, + + variety = B_APPV_DEVELOPMENT, + internal = 0, + + short_info ="TestApp1", + long_info = "TestApp1" +}; + +resource(2, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-elfexecutable"; diff --git a/src/tests/kits/app/bapplication/testapps/AppRunTestApp6.rsrc b/src/tests/kits/app/bapplication/testapps/AppRunTestApp6.rsrc deleted file mode 100644 index 3f61b197cd..0000000000 Binary files a/src/tests/kits/app/bapplication/testapps/AppRunTestApp6.rsrc and /dev/null differ diff --git a/src/tests/kits/app/bapplication/testapps/BApplicationTestApp4.rdef b/src/tests/kits/app/bapplication/testapps/BApplicationTestApp4.rdef new file mode 100644 index 0000000000..b92b7ae936 --- /dev/null +++ b/src/tests/kits/app/bapplication/testapps/BApplicationTestApp4.rdef @@ -0,0 +1,3 @@ +resource app_signature "application/x-vnd.obos-bapplication-testapp4-or-not"; + +resource(2, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-elfexecutable"; diff --git a/src/tests/kits/app/bapplication/testapps/BApplicationTestApp4.rsrc b/src/tests/kits/app/bapplication/testapps/BApplicationTestApp4.rsrc deleted file mode 100644 index b2f05b3b16..0000000000 Binary files a/src/tests/kits/app/bapplication/testapps/BApplicationTestApp4.rsrc and /dev/null differ diff --git a/src/tests/kits/app/bapplication/testapps/BApplicationTestApp5.rdef b/src/tests/kits/app/bapplication/testapps/BApplicationTestApp5.rdef new file mode 100644 index 0000000000..06811a96b7 --- /dev/null +++ b/src/tests/kits/app/bapplication/testapps/BApplicationTestApp5.rdef @@ -0,0 +1,3 @@ +resource app_signature "application/x-vnd.obos-bapplication-testapp5"; + +resource(2, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-elfexecutable"; diff --git a/src/tests/kits/app/bapplication/testapps/BApplicationTestApp5.rsrc b/src/tests/kits/app/bapplication/testapps/BApplicationTestApp5.rsrc deleted file mode 100644 index 1ca1850578..0000000000 Binary files a/src/tests/kits/app/bapplication/testapps/BApplicationTestApp5.rsrc and /dev/null differ diff --git a/src/tests/kits/app/bapplication/testapps/Jamfile b/src/tests/kits/app/bapplication/testapps/Jamfile index 7b8e54b4a5..2f9d3f7be0 100644 --- a/src/tests/kits/app/bapplication/testapps/Jamfile +++ b/src/tests/kits/app/bapplication/testapps/Jamfile @@ -1,6 +1,5 @@ SubDir HAIKU_TOP src tests kits app bapplication testapps ; -SetSubDirSupportedPlatformsBeOSCompatible ; AddSubDirSupportedPlatforms libbe_test ; SubDirHdrs [ FDirName $(HAIKU_TOP) src tests kits app common ] ; @@ -57,12 +56,12 @@ SimpleBAppTestApp BApplicationTestApp2b.cpp ; SimpleBAppTestApp BApplicationTestApp3.cpp ; SimpleBAppTestApp BApplicationTestApp3a.cpp ; SimpleBAppTestApp BApplicationTestApp3b.cpp ; -SimpleBAppTestApp BApplicationTestApp4.cpp : BApplicationTestApp4.rsrc ; -SimpleBAppTestApp BApplicationTestApp4a.cpp : BApplicationTestApp4.rsrc ; -SimpleBAppTestApp BApplicationTestApp4b.cpp : BApplicationTestApp4.rsrc ; -SimpleBAppTestApp BApplicationTestApp5.cpp : BApplicationTestApp5.rsrc ; -SimpleBAppTestApp BApplicationTestApp5a.cpp : BApplicationTestApp5.rsrc ; -SimpleBAppTestApp BApplicationTestApp5b.cpp : BApplicationTestApp5.rsrc ; +SimpleBAppTestApp BApplicationTestApp4.cpp : BApplicationTestApp4.rdef ; +SimpleBAppTestApp BApplicationTestApp4a.cpp : BApplicationTestApp4.rdef ; +SimpleBAppTestApp BApplicationTestApp4b.cpp : BApplicationTestApp4.rdef ; +SimpleBAppTestApp BApplicationTestApp5.cpp : BApplicationTestApp5.rdef ; +SimpleBAppTestApp BApplicationTestApp5a.cpp : BApplicationTestApp5.rdef ; +SimpleBAppTestApp BApplicationTestApp5b.cpp : BApplicationTestApp5.rdef ; # BApplication::Run() test apps @@ -70,17 +69,17 @@ SimpleBAppTestApp BApplicationTestApp5b.cpp : BApplicationTestApp5.rsrc ; local runTestApp1 = [ FGristFiles AppRunTestApp1$(SUFOBJ) ] ; -SimpleBAppTestApp AppRunTestApp1.cpp : AppRunTestApp1.rsrc +SimpleBAppTestApp AppRunTestApp1.cpp : AppRunTestApp1.rdef : $(commonObjects) ; -SimpleBAppTestApp2 AppRunTestApp2 : $(runTestApp1) : AppRunTestApp2.rsrc +SimpleBAppTestApp2 AppRunTestApp2 : $(runTestApp1) : AppRunTestApp2.rdef : $(commonObjects) ; -SimpleBAppTestApp2 AppRunTestApp3 : $(runTestApp1) : AppRunTestApp3.rsrc +SimpleBAppTestApp2 AppRunTestApp3 : $(runTestApp1) : AppRunTestApp3.rdef : $(commonObjects) ; -SimpleBAppTestApp2 AppRunTestApp4 : $(runTestApp1) : AppRunTestApp4.rsrc +SimpleBAppTestApp2 AppRunTestApp4 : $(runTestApp1) : AppRunTestApp4.rdef : $(commonObjects) ; -SimpleBAppTestApp2 AppRunTestApp5 : $(runTestApp1) : AppRunTestApp5.rsrc +SimpleBAppTestApp2 AppRunTestApp5 : $(runTestApp1) : AppRunTestApp5.rdef : $(commonObjects) ; -SimpleBAppTestApp2 AppRunTestApp6 : $(runTestApp1) : AppRunTestApp6.rsrc +SimpleBAppTestApp2 AppRunTestApp6 : $(runTestApp1) : AppRunTestApp6.rdef : $(commonObjects) ; CopyBAppTestApp AppRunTestApp3a : AppRunTestApp3 ;