From 4fe78e3499cc1b44141561d7a2e51ac4e7504140 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 22 Jun 2015 15:39:47 -0400 Subject: [PATCH] tests: Convert a lot of RSRCs to RDEFs. --- src/tests/Jamfile | 2 +- src/tests/UnitTester.rdef | 14 ++++ src/tests/UnitTester.rsrc | Bin 2361 -> 0 bytes src/tests/add-ons/print/ppd/test/Jamfile | 12 +-- .../print/ppd/test/PPDConfigApplication.rdef | 69 ++++++++++++++++++ .../print/ppd/test/PPDConfigApplication.rsrc | Bin 4193 -> 0 bytes .../bapplication/testapps/AppRunTestApp1.rdef | 17 +++++ .../bapplication/testapps/AppRunTestApp1.rsrc | Bin 2866 -> 0 bytes .../bapplication/testapps/AppRunTestApp2.rdef | 17 +++++ .../bapplication/testapps/AppRunTestApp2.rsrc | Bin 2866 -> 0 bytes .../bapplication/testapps/AppRunTestApp3.rdef | 17 +++++ .../bapplication/testapps/AppRunTestApp3.rsrc | Bin 2866 -> 0 bytes .../bapplication/testapps/AppRunTestApp4.rdef | 17 +++++ .../bapplication/testapps/AppRunTestApp4.rsrc | Bin 2866 -> 0 bytes .../bapplication/testapps/AppRunTestApp5.rdef | 17 +++++ .../bapplication/testapps/AppRunTestApp5.rsrc | Bin 2866 -> 0 bytes .../bapplication/testapps/AppRunTestApp6.rdef | 17 +++++ .../bapplication/testapps/AppRunTestApp6.rsrc | Bin 2866 -> 0 bytes .../testapps/BApplicationTestApp4.rdef | 3 + .../testapps/BApplicationTestApp4.rsrc | Bin 2118 -> 0 bytes .../testapps/BApplicationTestApp5.rdef | 3 + .../testapps/BApplicationTestApp5.rsrc | Bin 2111 -> 0 bytes .../kits/app/bapplication/testapps/Jamfile | 25 +++---- 23 files changed, 208 insertions(+), 22 deletions(-) create mode 100644 src/tests/UnitTester.rdef delete mode 100644 src/tests/UnitTester.rsrc create mode 100644 src/tests/add-ons/print/ppd/test/PPDConfigApplication.rdef delete mode 100644 src/tests/add-ons/print/ppd/test/PPDConfigApplication.rsrc create mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp1.rdef delete mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp1.rsrc create mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp2.rdef delete mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp2.rsrc create mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp3.rdef delete mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp3.rsrc create mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp4.rdef delete mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp4.rsrc create mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp5.rdef delete mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp5.rsrc create mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp6.rdef delete mode 100644 src/tests/kits/app/bapplication/testapps/AppRunTestApp6.rsrc create mode 100644 src/tests/kits/app/bapplication/testapps/BApplicationTestApp4.rdef delete mode 100644 src/tests/kits/app/bapplication/testapps/BApplicationTestApp4.rsrc create mode 100644 src/tests/kits/app/bapplication/testapps/BApplicationTestApp5.rdef delete mode 100644 src/tests/kits/app/bapplication/testapps/BApplicationTestApp5.rsrc 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 e47a8d13ec1cc88ccf9bf7f40213491613d9d3d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2361 zcmWFvW?*0t@ONPbQZ69O1|-M;AiWGgy)S_Vfy~HYgs?%v|A7D`P7C%44hDu?pur&X z*RV4%e1%xUun;KD0%b1+vX!B15JgM(jG9loxE>AL(Xbs&1EXnRB&UJS06%wLE-5Zx z81Q;}xCAjUFg5_OA_uVkV>FA~9srbJ4)6(aHBOu1qp}fHEpz6(xfKIx2)L!S?HrKB zS>O=~6y#q3!i)>Dddh)<&7LlfAr*7p9yA2j-VBEpeD%-ehzF{mAFyNIyqZazTrBkvR$?iemFm5$LG6tm`f=uBr36q~(x7g|6`_`@NEIMJ2>ua={s<&) z{U`kokA~5zaeMjg1dZr%i-M#Le{8{L*vRY>bzLo%W$}dQNop4;7Hkvaw(m{ zH6u|(U*?BV(TDadT+Yy+iL?K}?_d5kE)jLnq)4K2eng1+DqtnW zvr>LyLWOY!I>vPTleo%Y{jSR|_EBM&^>Li>@>WvWw5$kjThFk4vBQ?E~C7X@(gShisHVrjhb~c#^#G4bq!k^g`em% zb+#1KcziRFJ?4-|K#My;g|jM!{ehjm#;34 zzP>Kan3wwElmG2duUJta&8W%1!)72DtdBk-gah<|y6-kd+1mD6_PM{Of&7jS2kSYj zWm&^I)-cmLctxY9TC2CSvzHCF+>Zt9T}x?G>?pe%pRxf0$^C)0X=xpb9Bp&Ex0N~4 K>W7;#Nc0B*FPoeI 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 5e9cb6ed400ae9146f46952617e562a40efbc1b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2866 zcmWFvW?*0t@ONPWQZ69O1|-M;AiWGgy)T&|W@Ioz*dXEmKmZb_1$!|U14B2^V37H1 z*clj!H6Ievqv0?b4x?#cG!2ZV0m{-q zVnIPpW^!UlW`3T2g>G41ik?%dZfZ_iYDH>tX-Q&IPAUVYlKiCnVqKuHZc%BTZb@o! z36O0FamOe*8Ulkn1UP~23-M{ 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 cdda562a322c4bc6a9dfb05d5b421beb816e3ad3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2866 zcmWFvW?*0t@ONPWQZ69O1|-M;AiWGgy)T&|W@Ioz*dXEmKmZb_1$!|U14B2^V37H1 z*cli={s4guK=ukI2s;9(MgziRXaKU6p==OEOSg@hPrG;@4cpPM9ZdtHX<($K0bsQ{ z3PwXlT&f>6WAxmjKy@44CSiQgu^v z(o!o@lS@kylX6lS+yVj|fh|e~5awraa`g|katsKFck^*{4+gj4K<&6Ns3K6aPY|If y%rz+3)87xSEZEo67i12oMaqj%7VPQH0MZF+L2^NaLm~rQ;o7zyKRX8~#Q*>*ia5pq 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 f7428f57384b3e4de05fe25645328b91bfbe73a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2866 zcmWFvW?*0t@ONPWQZ69O1|-M;AiWGgy)T&|W@Ioz*dXEmKmZb_1$!|U14B2^V37H1 z*cli={s4guK=ukI2s;9(MgziRXaKU6p==OEOSg@hPrG;@4cpPM9ZdtHX<#I#0g#_Z z!Dt8!_7F%cD9Fi7PAtjH&(p8aEz3*M%TLNL)&&ad7M14dmZTP!0NI8NnChHTbyIWF zQY%uEOG^@ya#9)G0sn~$S=Ft`l|YR82^6@i+4f(S)n xu0g?`{(f*}!M>ipAag)1QeK3zU{7}jkWNqwk_#dn5*gqM*S7We**QQd1^_XRILH71 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 3f61b197cde2730a1b62dcf594e68695fb8c2883..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2866 zcmWFvW?*0t@ONPWQZ69O1|-M;AiWGgy)T&|W@Ioz*dXEmKmZb_1$!|U14B2^V37H1 z*cli={s4guK=ukI2s;9(MgziRXaKU6p==OEOSg@hPrG;@4cpPM9ZdtHX<($K0ce#5 z^7beg4S_)&0*M6$Iho0cC7Jno`W3omc`17NN%_UPKw;gY(mdUg)Z!8#+mHcMol~lA zYED{eMQU1p1vS+KrK>UgtA~ycLtD7Pz#a^A{-JK;0o8a_4wI2Kq&?Q6@ECt 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 b2f05b3b16fc80db4232771d60db87018dea8f7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2118 zcmWFvW?*0t@ONPXQZ69O1|-M;AiWGgy)T&|W@Ioz*dXEmKmZb_1)G_Jfx#YVFv$Eh z>tX-Q&IPAWsNuct4t v#%2IvUIr&u|6nV}fPna5Pj?1T%K(JAAi^P$0j}U09aO8|-2d}EP>KNnoxmzh 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 1ca1850578d5fa8506c6c2ff7dc0fd094043d616..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2111 zcmWFvW?*0t@ONPXQZ69O1|-M;AiWGgy)T&|W@Ioz*dXEmKmZb_1^W*>1A{%#V37H1 zfNWieH4Ha_Y-K2$7WR&sNxL{54cpPM9ZdtHX<#%BV5Wh@f`XjP09SBT4yw*??*I87D8&E(J?bc| 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 ;