[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Norbert Thiebaud]

 solenv/gbuild/platform/dragonfly.mk |    7 -------
 solenv/gbuild/platform/freebsd.mk   |    7 -------
 solenv/gbuild/platform/ios.mk       |   11 +++++++++++
 solenv/gbuild/platform/linux.mk     |    7 -------
 solenv/gbuild/platform/macosx.mk    |    7 -------
 solenv/gbuild/platform/netbsd.mk    |    7 -------
 solenv/gbuild/platform/openbsd.mk   |    7 -------
 solenv/gbuild/platform/solaris.mk   |    7 -------
 solenv/gbuild/platform/winmingw.mk  |   10 ----------
 9 files changed, 11 insertions(+), 59 deletions(-)

New commits:
commit b796c129e296cbd6e9a2d896739441a04a962b08
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Aug 20 17:35:26 2011 -0500

    no need to redefine gb_Helper_conert_native over and over again....

diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
index 0adf1b6..a06e6a9 100644
--- a/solenv/gbuild/platform/dragonfly.mk
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -42,11 +42,4 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib
 
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index fc5b714..218f621 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -40,11 +40,4 @@ gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index cdd76d8..e02739d 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -31,11 +31,4 @@ gb_LinkTarget_LDFLAGS += \
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e89692b..d8f17db 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -157,13 +157,6 @@ define gb_Helper_convert_native
 $(1)
 endef
 
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
 # YaccObject class
 
 ifeq ($(CPUNAME),POWERPC)
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
index b141222..744c5d1 100644
--- a/solenv/gbuild/platform/netbsd.mk
+++ b/solenv/gbuild/platform/netbsd.mk
@@ -42,11 +42,4 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib:/usr/X11R7/lib
 
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
index 05b4903..2e7100d 100644
--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -61,11 +61,4 @@ mkdir -p $(dir $(1)) && \
 		-o $(1))
 endef
 
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 6b081a8..90fadba 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -138,13 +138,6 @@ define gb_Helper_convert_native
 $(1)
 endef
 
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
 
 # CObject class
 
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index cdc8444..e36a8ea 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -211,16 +211,6 @@ else
 gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 endif
 
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
-$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
-$(1)))))
-endef
-
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
commit ace5147f4f8eb651c0d9e83f1fc710118f239ce2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Aug 20 17:34:28 2011 -0500

    ios does not seems to inherit form macos, so add a yacc rule there too

diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 1039497..7621ff0 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -45,6 +45,7 @@ gb_GCCP := $(CC)
 gb_AR := ar
 gb_AWK := awk
 gb_CLASSPATHSEP := :
+gb_YACC := bison
 
 gb_OSDEFS := \
 	-D$(OS) \
@@ -134,6 +135,16 @@ define gb_Helper_convert_native
 $(1)
 endef
 
+# YaccObject class
+
+define gb_YaccObject__command
+$(call gb_Output_announce,$(2),$(true),YAC,3)
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(3)) && \
+	$(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+
+endef
+
 
 # CObject class