[Libreoffice-commits] .: solenv/inc

[Andras Timar]

 solenv/inc/rules.mk    |    7 -------
 solenv/inc/target.mk   |   20 --------------------
 solenv/inc/tg_merge.mk |    5 -----
 solenv/inc/unitools.mk |    1 -
 4 files changed, 33 deletions(-)

New commits:
commit 1f536f3166fd1d6c22771117c51497193abe8fd3
Author: Andras Timar <atimar at suse.com>
Date:   Sun Jan 15 14:56:44 2012 +0100

    remove dmake rules for unused file type *.xrb

diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 6700845..f45d46b 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -646,13 +646,6 @@ $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
-$(COMMONMISC)/$(TARGET)/%.xrb : %.xrb
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
 $(COMMONMISC)/$(MYPATH)/%.xrm : %.xrm
     $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index f166e80..3cca55d 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -928,10 +928,6 @@ SDI4TARGET=$(MISC)/$(SDI4NAME).don
 SDI5TARGET=$(MISC)/$(SDI5NAME).don
 .ENDIF
 
-.IF "$(XMLPROPERTIES)"!=""
-XMLPROPERTIESN:=$(foreach,i,$(XMLPROPERTIES) $(MISC)/$(TARGET)_$(i:s/.xrb/.done/))
-.ENDIF			# "$(XMLPROPERTIES)"!=""
-
 .IF "$(UNIXTEXT)"!=""
 .IF "$(GUI)"=="UNX"
 CONVERTUNIXTEXT:=$(UNIXTEXT)
@@ -988,7 +984,6 @@ ALLTAR:	\
         $(ZIPALL) \
         $(SDITARGET)	$(SDI1TARGET)	$(SDI2TARGET)		\
         $(SDI3TARGET)	$(SDI4TARGET)	$(SDI5TARGET)		\
-        $(XMLPROPERTIESN) \
         $(RCTARGET) \
         $(SCP_PRODUCT_TYPE) \
         $(ALLPARFILES) \
@@ -1066,7 +1061,6 @@ ALLTAR: \
         $(NOLIBOBJTARGET) \
         $(NOLIBSLOTARGET) \
         $(OTHERTARRGET) \
-        $(XMLPROPERTIESN) \
         $(ALL_JAVA_TARGETS) \
         $(OBJTARGET)	$(SLOTARGET)	$(SMRSLOTARGET)		\
         $($(SECOND_BUILD)SLOTARGET) \
@@ -1444,20 +1438,6 @@ $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF)
 .ENDIF			# "$(WITH_LANG)"==""
 .ENDIF          # "$(LOCALIZE_ME_DEST)"!=""
 
-.IF "$(XMLPROPERTIES)"!=""
-.IF "$(L10N_framework)"!=""
-XML_ISO_CODE*=-ISO99 $(L10N_framework)
-.ENDIF
-.IF "$(WITH_LANG)"!=""
-$(MISC)/$(TARGET)_%.done : $(COMMONMISC)/$(TARGET)/%.xrb
-.ELSE			# "$(WITH_LANG)"!=""
-$(MISC)/$(TARGET)_%.done : %.xrb
-.ENDIF			# "$(WITH_LANG)"!=""
-    @@-$(RM) $(MISC)/$(<:b).interm$(TARGET)
-    native2ascii -encoding UTF8 $< $(MISC)/$(<:b).interm$(TARGET) && $(XMLEX) -i $(MISC)/$(<:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@
-    @@$(RM)  $(MISC)/$(<:b).interm$(TARGET)
-.ENDIF			# "$(XMLPROPERTIES)"!=""
-
 .IF "$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)"!=""
 .INCLUDE : _tg_sdi.mk
 .ENDIF			# "$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)"!=""
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk
index 19f44cb..d535f03 100644
--- a/solenv/inc/tg_merge.mk
+++ b/solenv/inc/tg_merge.mk
@@ -34,11 +34,6 @@ MKFILENAME:=tg_merge.mk
 $(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
 .ENDIF
 
-# *.xrb merge
-.IF "$(XMLPROPERTIES)"!=""
-$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
-.ENDIF
-
 # *.xrm merge
 .IF "$(READMEFILES)"!=""
 $(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF)
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 6d7ef05..a46e082 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -28,7 +28,6 @@
 # Common tools - move this to the end / consolidate
 TRANSEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/transex3
 ULFEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfex
-XMLEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmlex
 XRMEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xrmex
 CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cfgex
 AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc