update regression tests for new component registration

i18npool/prj/build.lst

@@ -24,4 +24,4 @@ inp  i18npool\source\textconversion\data        nmake   -   all inp_textconv_dic
 inp  i18npool\source\search                     nmake   -   all inp_search inp_inc NULL
 inp  i18npool\source\ordinalsuffix              nmake   -   all inp_ordinalsuffix NULL
 inp  i18npool\util                              nmake   -   all inp_util inp_brkit inp_dict inp_chclass inp_translit inp_cal inp_dnum inp_natnum inp_localedata inp_locdata_data inp_numformat inp_rserv inp_index inp_index_data inp_collator inp_collator_data inp_inputchecker inp_textconversion inp_textconv_dict inp_search inp_isolang inp_paper inp_ordinalsuffix NULL
-#FIXME (needs update for new component registration): inp  i18npool\qa\cppunit                        nmake   -   all inp_qa_cppunit inp_util NULL
+inp  i18npool\qa\cppunit                        nmake   -   all inp_qa_cppunit inp_util NULL

i18npool/qa/cppunit/makefile.mk

@@ -31,6 +31,8 @@ TARGET=qa_cppunit
 
 ENABLE_EXCEPTIONS=TRUE
 
+my_components = qa_i18npool
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
@@ -83,10 +85,17 @@ $(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb
     $(GNUCOPY) $? $@
 
 #Make a services.rdb with the services we know we need to get up and running
-$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb makefile.mk
+$(MISC)/$(TARGET)/services.rdb .ERRREMOVE: $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/services.input \
+        $(my_components:^"$(MISC)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/$(TARGET)/services.input
+
+$(MISC)/$(TARGET)/services.input:
     $(MKDIRHIER) $(@:d)
-    $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
-        -c $(DLLDEST)/i18npool.uno$(DLLPOST)
+    echo \
+        '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
+        > $@
 
 test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb
     @echo ----------------------------------------------------------
@@ -95,6 +104,4 @@ test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/t
     $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
         -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
         -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \
-        -env:OOO_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
-        -env:BRAND_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
-        -env:UNO_USER_PACKAGES_CACHE="$(my_file)$(PWD)/$(MISC)/$(TARGET)"
+        -env:OOO_INBUILD_SHAREDLIB_DIR="$(my_file)$(PWD)/$(DLLDEST)"

i18npool/util/makefile.mk

@@ -80,10 +80,16 @@ SHL1STDLIBS= \
 
 .INCLUDE :	target.mk
 
-ALLTAR : $(MISC)/i18npool.component
+ALLTAR : $(MISC)/i18npool.component $(MISC)/qa_i18npool.component
 
 $(MISC)/i18npool.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
         i18npool.component
     $(XSLTPROC) --nonet --stringparam uri \
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt i18npool.component
+
+$(MISC)/qa_i18npool.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        i18npool.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_INBUILD_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt i18npool.component