subject:"\[Libreoffice\-commits\] .\: solenv\/inc"

[Libreoffice-commits] .: solenv/inc

2012-04-17 Thread Tomáš Chvátal

 solenv/inc/libs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf1e3b9132a804bd5d7eb0294c1d7e4f0254f52b
Author: Tomas Chvatal tchva...@suse.cz
Date:   Tue Apr 17 16:38:39 2012 +0200

Use proper variable when using system clucene.

Thanks to Caolan for the fix.

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 3adeb01..a936193 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -182,7 +182,7 @@ HM2LIBST=-lhmwrap
 LINGULIB=$(HM2LIBST)
 LNGLIB=-llng$(DLLPOSTFIX)
 .IF $(SYSTEM_CLUCENE)==YES
-CLUCENELIB=$(LIBCLUCENE_LIBS)
+CLUCENELIB=$(CLUCENE_LIBS)
 .ELSE
 CLUCENELIB=-lclucene
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2012-04-14 Thread David Tardon

 solenv/inc/settings.mk  |2 +-
 solenv/inc/unxaigppc.mk |2 +-
 solenv/inc/unxandr.mk   |2 +-
 solenv/inc/unxgcc.mk|2 +-
 solenv/inc/unxmacx.mk   |2 +-
 solenv/inc/unxnbsd.mk   |2 +-
 solenv/inc/unxsoli4.mk  |2 +-
 solenv/inc/unxsols4.mk  |2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bcc942451d7b5291d3f4c56ccd6868b23e2e923c
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 08:11:37 2012 +0200

really replace SDK with SDKBIN

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 9988f7c..575fdc9 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1226,7 +1226,7 @@ RCLINKFLAGS+= $(ENVRCLINKFLAGS)
 LINKFLAGSRUNPATH_URELIB*=
 LINKFLAGSRUNPATH_UREBIN*=
 LINKFLAGSRUNPATH_OOO*=
-LINKFLAGSRUNPATH_SDK*=
+LINKFLAGSRUNPATH_SDKBIN*=
 LINKFLAGSRUNPATH_OXT*=
 LINKFLAGSRUNPATH_NONE*=
 
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
index 5e67079..983ae74 100644
--- a/solenv/inc/unxaigppc.mk
+++ b/solenv/inc/unxaigppc.mk
@@ -43,7 +43,7 @@ BRANDPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) 
$(foreach,i,{$(PRODUCTLIST)} /opt
 LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
 
LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
 
LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_SDKBIN:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
 LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
 
 LINKFLAGSAPPGUI:=
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index e8cbd9e..812c932 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -66,4 +66,4 @@ ENFORCEDSHLPREFIX=lib
 LINKFLAGSRUNPATH_URELIB=
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 151fc8b..2da3ef0 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -195,7 +195,7 @@ 
LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
 
LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
 #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 
LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_SDKBIN=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 # flag -Wl,-z,noexecstack sets the NX bit on the stack
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index c829a45..e402783 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -185,7 +185,7 @@ EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH)
 LINKFLAGSRUNPATH_URELIB=-install_name 
'@__URELIB/$(@:f)'
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=-install_name 
'@__OOO/$(@:f)'
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=-install_name 
'@__NONE/$(@:f)'
 LINKFLAGS=$(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxnbsd.mk b/solenv/inc/unxnbsd.mk
index 712ed6a..8dbe480 100644
--- a/solenv/inc/unxnbsd.mk
+++ b/solenv/inc/unxnbsd.mk
@@ -18,7 +18,7 @@ BUILD64=1
 # NetBSD has no support for using relative paths with $ORIGIN
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
 
 LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
 LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index af85064..9120433 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -131,7 +131,7 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
 LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
 #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDKBIN=-R\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index e81ca0e..f1a1cd1 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -137,7 +137,7 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
 LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
 #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDKBIN=-R\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp

[Libreoffice-commits] .: solenv/inc

2012-03-06 Thread David Tardon

 solenv/inc/libs.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 021f685f1683ebab157a899def6316be206632eb
Author: David Tardon dtar...@redhat.com
Date:   Tue Mar 6 13:12:25 2012 +0100

mingw: synchronize berkeleydb lib name with gbuild

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 6f0e4fd..0e164f4 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -215,6 +215,8 @@ NEON3RDLIB=-lneon
 .ENDIF
 .IF $(SYSTEM_DB) == YES
 BERKELEYLIB=-l$(DB_LIB)
+.ELIF $(GUI)$(COM)==WNTGCC
+BERKELEYLIB=-ldb47
 .ELSE
 BERKELEYLIB=-ldb-4.7
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2012-02-29 Thread Andras Timar

 solenv/inc/langlist.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3cc7cbeb0efab138696bb9901b33648025e29a45
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 29 16:47:35 2012 +0100

remove ky-CN, apparently they did not start translation

diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index d61eef7..67515a8 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -77,7 +77,6 @@ ko \
 kok \
 ks \
 ku \
-ky-CN \
 lb \
 lo \
 lt \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2012-02-24 Thread Lubos Lunak

 solenv/inc/unxgcc.mk  |2 +-
 solenv/inc/wntgcci.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 752de2112756b49854942c532b083dbe9ea63a2f
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Fri Feb 24 16:47:21 2012 +0100

missed instances of -std=c++0x when switching to gnu++0x

diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index a3231a6..14983dd 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -88,7 +88,7 @@ CFLAGSCXX= -pipe $(ARCH_FLAGS)
 CFLAGSCXX+=-fvisibility-inlines-hidden
 .ENDIF # $(HAVE_GCC_VISIBILITY_FEATURE) == TRUE
 .IF $(HAVE_CXX0X) == TRUE
-CFLAGSCXX+=-std=c++0x
+CFLAGSCXX+=-std=gnu++0x
 .IF $(GCCNUMVER) = 00040005
 CFLAGSCXX+=-Wno-deprecated-declarations
 .ENDIF
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 6795d0f..bdf46b4 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -48,7 +48,7 @@ CFLAGSCC=-pipe $(ARCH_FLAGS)
 CFLAGSCXX=-pipe $(ARCH_FLAGS)
 
 .IF $(HAVE_CXX0X) == TRUE
-# FIXME still does not compile fully CFLAGSCXX+=-std=c++0x
+# FIXME still does not compile fully CFLAGSCXX+=-std=gnu++0x
 .ENDIF
 
 CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2012-02-20 Thread Andras Timar

 solenv/inc/_tg_zip.mk |  100 --
 solenv/inc/tg_zip.mk  |   10 ++---
 2 files changed, 44 insertions(+), 66 deletions(-)

New commits:
commit 3aece33a9b46e8b3d5e620e76af26e817f68332f
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 20 17:47:26 2012 +0100

remove avoid_cvs_dir macro

diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index deb2aa0..da3560b 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -3,10 +3,8 @@
 .IF $(GUI)==WNT
 command_seperator=
 #command_seperator=^
-avoid_cvs_dir=-x *CVS* -x *.svn*
 .ELSE
 command_seperator=;
-avoid_cvs_dir=-x *CVS* -x *.svn*
  
 .ENDIF
 
@@ -52,9 +50,9 @@ $(ZIP1DEPFILE) :
 @echo #  $(MISC)/$(@:f)
 .IF $(ZIP1DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
-$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) 
$(foreach,j,$(ZIP1LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )}) $(avoid_cvs_dir)  
$(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
+$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) 
$(foreach,j,$(ZIP1LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )})  $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE  # $(ZIP1DIR) != 
-$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/ 
$(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) 
{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ 
$(@:db)))} $j )}) $(avoid_cvs_dir)  $(MISC)/$(@:f)
+$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/ 
$(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) 
{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ 
$(@:db)))} $j )})  $(MISC)/$(@:f)
 .ENDIF # $(ZIP1DIR) != 
 @echo $(@:n:s#\#/#) : makefile.mk  $(MISC)/$(@:f)
 
@@ -66,14 +64,14 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
 @echo -- $(eq,$?,$(?:s/delzip/zzz/) 
$(NULLDEV) )
 .IF $(ZIP1DIR) != 
 @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)
-$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} 
$(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) 
$(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  
$(avoid_cvs_dir) $(CHECKZIPRESULT)
+$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} 
$(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) 
$(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  
$(CHECKZIPRESULT)
 $(COMMAND_ECHO)$(IFEXIST) 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
 $(PERL) -w $(SOLARENV)/bin/cleanzip.pl 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
 $(FI)
 $(COMMAND_ECHO)$(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)  $@ 
 $(COMMAND_ECHO)$(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)
 .ELSE  # $(ZIP1DIR) != 
-$(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $@ 
$(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
+$(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $@ 
$(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(@:db))} $j )) -x delzip $(CHECKZIPRESULT)
 $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
 $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
 $(FI)
@@ -90,10 +88,8 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
 .IF $(GUI)==WNT
 command_seperator=
 #command_seperator=^
-avoid_cvs_dir=-x *CVS* -x *.svn*
 .ELSE
 command_seperator=;
-avoid_cvs_dir=-x *CVS* -x *.svn*
  
 .ENDIF
 
@@ -139,9 +135,9 @@ $(ZIP2DEPFILE) :
 @echo #  $(MISC)/$(@:f)
 .IF $(ZIP2DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
-$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) 
$(foreach,j,$(ZIP2LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )}) $(avoid_cvs_dir)  
$(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
+$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/

[Libreoffice-commits] .: solenv/inc

2012-02-20 Thread Andras Timar

 solenv/inc/extension_post.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit aad0b5d6a6ad8a3a895c6ffba3390af6861017d7
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 20 18:04:38 2012 +0100

add $(COMMAND-ECHO)

diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 20b8682..8a1a328 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -39,15 +39,15 @@ fixme4=$(fixme:n)
 $(EXTENSIONDIR)/$(COMPONENT_CONFIGDEST)/%.xcu : %.xcu
 # ugly hacking to workaround prepended first source path
 @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d))
-$(GNUCOPY) $ $(subst,$(fixme2),$(MISC) $@)
+$(COMMAND_ECHO)$(GNUCOPY) $ $(subst,$(fixme2),$(MISC) $@)
 
 $(EXTENSIONDIR)/$(COMPONENT_CONFIGDESTSCHEMA)/%.xcs : %.xcs
 @@-$(MKDIRHIER) $(subst,$(fixme4),$(MISC) $(@:d))
-$(GNUCOPY) $ $(subst,$(fixme4),$(MISC) $@)
+$(COMMAND_ECHO)$(GNUCOPY) $ $(subst,$(fixme4),$(MISC) $@)
 
 $(EXTENSIONDIR)/%.jar : $(SOLARBINDIR)/%.jar
 @@-$(MKDIRHIER) $(@:d)
-$(GNUCOPY) $ $@
+$(COMMAND_ECHO)$(GNUCOPY) $ $@
 
 .IF $(COMPONENT_FILES)!=
 COMPONENT_FILES_SRC*=./
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2012-01-15 Thread 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 ati...@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
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2012-01-05 Thread Andras Timar

 solenv/inc/minor.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff76821030568038bde7fb72985238bc666c8352
Author: Andras Timar ati...@suse.com
Date:   Thu Jan 5 13:34:32 2012 +0100

Bump year

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index db639a4..f9c24e7 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -8,4 +8,4 @@ VERSIONMAJOR=3
 VERSIONMINOR=6
 VERSIONMICRO=0
 
-COPYRIGHTYEARRANGE=2000-2011
+COPYRIGHTYEARRANGE=2000-2012
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2011-12-08 Thread Lionel Elie Mamane

 solenv/inc/tg_ext.mk |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 58844404ad9c9da806b9b521d5e39af6cf78b480
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Dec 9 00:37:05 2011 +0100

tg_ext: fix unpack for flat zip files

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index f31c340..a6335a5 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -58,8 +58,10 @@ fake_root_dir=/$(TARFILE_ROOTDIR)
 #MUST match fake_root_dir in directory levels
 fake_back=../
 .IF $(TARFILE_IS_FLAT) != 
+zip_dir=.
 TAR_STRIP_LEVEL=0
 .ELSE
+zip_dir=..
 TAR_STRIP_LEVEL=1
 .ENDIF $(TARFILE_IS_FLAT) != 
 
@@ -146,22 +148,22 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
 @-$(RM) $@
-@noop $(assign UNPACKCMD := cd ..  unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip)
+@noop $(assign UNPACKCMD := cd $(zip_dir)  unzip $(unzip_quiet_switch)  
-o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip)
 @$(TYPE) $(mktmp $(UNPACKCMD))  $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.oxt
 @-$(RM) $@
-@noop $(assign UNPACKCMD := cd ..  unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
+@noop $(assign UNPACKCMD := cd $(zip_dir)  unzip $(unzip_quiet_switch)  
-o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
 @$(TYPE) $(mktmp $(UNPACKCMD))  $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
 @-$(RM) $@
 .IF $(OS)==SOLARIS
-@noop $(assign UNPACKCMD := cd ..  jar xf 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
+@noop $(assign UNPACKCMD := cd $(zip_dir)  jar xf 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
 .ELSE  # $(OS)==SOLARIS
-@noop $(assign UNPACKCMD := cd ..  unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
+@noop $(assign UNPACKCMD := cd $(zip_dir)  unzip $(unzip_quiet_switch)  
-o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
 .ENDIF # $(OS)==SOLARIS
 @$(TYPE) $(mktmp $(UNPACKCMD))  $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2011-12-08 Thread Lionel Elie Mamane

 solenv/inc/tg_ext.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0189e8881de7a48c62fdf84a9b0e9ce8668a530b
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Dec 9 00:54:46 2011 +0100

tg_ext.ml: fix patch when filename ambiguous

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index a6335a5..1ab9dc6 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -194,9 +194,9 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : 
$(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
 $(COMMAND_ECHO)$(TOUCH) $@
 .ELSE  # $(PATCH_FILES)==none ||   $(PATCH_FILES)==
 .IF $(GUI)==WNT
-$(COMMAND_ECHO)cd $(PACKAGE_DIR)  $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | (cd 
.$(fake_root_dir)  patch $(PATCHFLAGS) -p3 )  $(TOUCH) $(PATCH_FLAG_FILE)
+$(COMMAND_ECHO)cd $(PACKAGE_DIR)  $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | (cd 
.$(fake_root_dir)  patch $(PATCHFLAGS) -p2 )  $(TOUCH) $(PATCH_FLAG_FILE)
 .ELSE   # $(GUI)==WNT
-$(COMMAND_ECHO)cd $(PACKAGE_DIR)  $(TYPE) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | (cd .$(fake_root_dir)  
$(GNUPATCH) $(PATCHFLAGS) -p3 )  $(TOUCH) $(PATCH_FLAG_FILE)
+$(COMMAND_ECHO)cd $(PACKAGE_DIR)  $(TYPE) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | (cd .$(fake_root_dir)  
$(GNUPATCH) $(PATCHFLAGS) -p2 )  $(TOUCH) $(PATCH_FLAG_FILE)
 .ENDIF  # $(GUI)==WNT
 .ENDIF # $(PATCH_FILES)==none ||   $(PATCH_FILES)==
 .IF $(T_ADDITIONAL_FILES)!=
@@ -306,10 +306,10 @@ $(MISC)/$(TARFILE_ROOTDIR).done : 
$(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack
 #.IF $(my4ver:s/.//:s/,//) = 300
 #  $(COMMAND_ECHO)cd $(MISC)  ( $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | patch 
$(PATCHFLAGS) -p2 )
 #.ELSE # $(my4ver:s/.//:s/,//) = 300
-$(COMMAND_ECHO)cd $(MISC)  $(TYPE:s/+//) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | (cd 
.$(fake_root_dir)  patch $(PATCHFLAGS) -p3 )
+$(COMMAND_ECHO)cd $(MISC)  $(TYPE:s/+//) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | (cd 
.$(fake_root_dir)  patch $(PATCHFLAGS) -p2 )
 #.ENDIF# $(my4ver:s/.//:s/,//) = 300
 .ELSE   # $(GUI)==WNT
-$(COMMAND_ECHO)cd $(MISC)  $(TYPE) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | ( cd .$(fake_root_dir)  
$(GNUPATCH) $(PATCHFLAGS) -p3 )
+$(COMMAND_ECHO)cd $(MISC)  $(TYPE) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | ( cd .$(fake_root_dir)  
$(GNUPATCH) $(PATCHFLAGS) -p2 )
 .ENDIF  # $(GUI)==WNT
 .IF $(CONVERTFILES)!=
 $(COMMAND_ECHO)$(CONVERT) dos  $(foreach,i,$(CONVERTFILES) 
$(MISC)/$(TARFILE_ROOTDIR)/$i)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2011-12-06 Thread Miklos Vajna

 solenv/inc/langlist.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0d5b38240caf03323d9a180811653eb38eaf7f48
Author: Miklos Vajna vmik...@frugalware.org
Date:   Tue Dec 6 20:06:33 2011 +0100

langlist.mk: remove bogus Turkmen language

This was added in cbf182a975dd170aa4997677ac3516ade4cb30a7, but
scp2/source/ooo/module_langpack.ulf was never updated accordingly, nor
there is such a language on Pootle.

diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 8a79b15..f044711 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -121,7 +121,6 @@ ta \
 te \
 tg \
 th \
-tk \
 tn \
 tr \
 ts \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2011-11-16 Thread Jan Holesovsky

 solenv/inc/_tg_shl.mk |  180 +-
 solenv/inc/tg_shl.mk  |   18 -
 2 files changed, 22 insertions(+), 176 deletions(-)

New commits:
commit 2d19e9bb07ccff3134f855812dddfda5c07b1fe4
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Nov 16 14:17:03 2011 +0100

Kill one usage of chrel.sed to fix build.

diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index f7aa241..7c537be 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -225,19 +225,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL1TARGETN:b)_linkinc.ls
 $(SHL1TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
-.IF $(SHL1USE_EXPORTS)==name
-.IF $(GUI)==WNT
-.IF $(COM)!=GCC
-.IF $(SHL1LIBS)!=
-SHL1LINKLIST=$(MISC)/$(SHL1TARGET)_link.lst
-SHL1LINKLISTPARAM=@$(SHL1LINKLIST)
-$(SHL1LINKLIST) : $(SHL1LIBS)
-@@-$(RM) $@
-$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) 
$(i:s/.lib/.lin/))  $@
-.ENDIF  # $(SHL1LIBS)!=
-.ENDIF  # $(COM)!=GCC
-.ENDIF
-.ENDIF # $(SHL1USE_EXPORTS)==name
 
 $(MISC)/%linkinc.ls:
 @echo .  $@
@@ -254,8 +241,7 @@ $(SHL1TARGETN) : \
 $(USE_SHL1DEF)\
 $(USE_SHL1VERSIONMAP)\
 $(SHL1RES)\
-$(SHL1DEPN) \
-$(SHL1LINKLIST)
+$(SHL1DEPN)
 @echo Making:$(@:f)
 .IF $(GUI) == WNT
 .IF $(SHL1DEFAULTRES)!=
@@ -395,7 +381,7 @@ $(SHL1TARGETN) : \
 $(USE_1IMPLIB) \
 $(STDOBJ)  \
 $(SHL1OBJS) $(SHL1VERSIONOBJ))   \
-$(SHL1LINKLISTPARAM) \
+$(SHL1LIBS) \
 @$(mktmp $(SHL1STDLIBS)  \
 $(SHL1STDSHL) $(STDSHL1)   \
 $(SHL1LINKRES) \
@@ -729,19 +715,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL2TARGETN:b)_linkinc.ls
 $(SHL2TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
-.IF $(SHL2USE_EXPORTS)==name
-.IF $(GUI)==WNT
-.IF $(COM)!=GCC
-.IF $(SHL2LIBS)!=
-SHL2LINKLIST=$(MISC)/$(SHL2TARGET)_link.lst
-SHL2LINKLISTPARAM=@$(SHL2LINKLIST)
-$(SHL2LINKLIST) : $(SHL2LIBS)
-@@-$(RM) $@
-$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) 
$(i:s/.lib/.lin/))  $@
-.ENDIF  # $(SHL2LIBS)!=
-.ENDIF  # $(COM)!=GCC
-.ENDIF
-.ENDIF # $(SHL2USE_EXPORTS)==name
 
 $(MISC)/%linkinc.ls:
 @echo .  $@
@@ -758,8 +731,7 @@ $(SHL2TARGETN) : \
 $(USE_SHL2DEF)\
 $(USE_SHL2VERSIONMAP)\
 $(SHL2RES)\
-$(SHL2DEPN) \
-$(SHL2LINKLIST)
+$(SHL2DEPN)
 @echo Making:$(@:f)
 .IF $(GUI) == WNT
 .IF $(SHL2DEFAULTRES)!=
@@ -899,7 +871,7 @@ $(SHL2TARGETN) : \
 $(USE_2IMPLIB) \
 $(STDOBJ)  \
 $(SHL2OBJS) $(SHL2VERSIONOBJ))   \
-$(SHL2LINKLISTPARAM) \
+$(SHL2LIBS) \
 @$(mktmp $(SHL2STDLIBS)  \
 $(SHL2STDSHL) $(STDSHL2)   \
 $(SHL2LINKRES) \
@@ -1233,19 +1205,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL3TARGETN:b)_linkinc.ls
 $(SHL3TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
-.IF $(SHL3USE_EXPORTS)==name
-.IF $(GUI)==WNT
-.IF $(COM)!=GCC
-.IF $(SHL3LIBS)!=
-SHL3LINKLIST=$(MISC)/$(SHL3TARGET)_link.lst
-SHL3LINKLISTPARAM=@$(SHL3LINKLIST)
-$(SHL3LINKLIST) : $(SHL3LIBS)
-@@-$(RM) $@
-$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) 
$(i:s/.lib/.lin/))  $@
-.ENDIF  # $(SHL3LIBS)!=
-.ENDIF  # $(COM)!=GCC
-.ENDIF
-.ENDIF # $(SHL3USE_EXPORTS)==name
 
 $(MISC)/%linkinc.ls:
 @echo .  $@
@@ -1262,8 +1221,7 @@ $(SHL3TARGETN) : \
 $(USE_SHL3DEF)\
 $(USE_SHL3VERSIONMAP)\
 $(SHL3RES)\
-$(SHL3DEPN) \
-$(SHL3LINKLIST)
+$(SHL3DEPN)
 @echo Making:$(@:f)
 .IF $(GUI) == WNT
 .IF $(SHL3DEFAULTRES)!=
@@ -1403,7 +1361,7 @@ $(SHL3TARGETN) : \
 $(USE_3IMPLIB) \
 $(STDOBJ)  \
 $(SHL3OBJS) $(SHL3VERSIONOBJ))   \
-$(SHL3LINKLISTPARAM) \
+$(SHL3LIBS) \
 @$(mktmp $(SHL3STDLIBS)  \
 $(SHL3STDSHL) $(STDSHL3)   \
 $(SHL3LINKRES) \
@@ -1737,19 +1695,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL4TARGETN:b)_linkinc.ls
 $(SHL4TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
-.IF $(SHL4USE_EXPORTS)==name
-.IF $(GUI)==WNT
-.IF $(COM)!=GCC
-.IF $(SHL4LIBS)!=
-SHL4LINKLIST=$(MISC)/$(SHL4TARGET)_link.lst
-SHL4LINKLISTPARAM=@$(SHL4LINKLIST)
-$(SHL4LINKLIST) : $(SHL4LIBS)
-@@-$(RM) $@
-$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) 
$(i:s/.lib/.lin/))  $@
-.ENDIF  # $(SHL4LIBS)!=
-.ENDIF  # $(COM)!=GCC
-.ENDIF
-.ENDIF # $(SHL4USE_EXPORTS)==name

[Libreoffice-commits] .: solenv/inc

2011-11-03 Thread Tor Lillqvist

 solenv/inc/unx.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit be5855de62ea99a9bb67556f1db548aa56cda605
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Nov 3 13:33:18 2011 +0200

Use DYLD_LIBRARY_PATH when OS_FOR_BUILD == MACOSX

diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 74ed8d5..2dfbaf7 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -179,4 +179,8 @@ SOLARLIB+=-L$(KDE_ROOT)/lib64
 .ENDIF  # $(KDE_ROOT)!=
 .ENDIF  # $(ENABLE_KDE) != 
 
+.IF $(OS_FOR_BUILD) == MACOSX
+OOO_LIBRARY_PATH_VAR *= DYLD_LIBRARY_PATH
+.ELSE
 OOO_LIBRARY_PATH_VAR *= LD_LIBRARY_PATH
+.ENDIF
\ No newline at end of file
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2011-10-10 Thread Fridrich Strba

 solenv/inc/wntgcci.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2e267c98bd001929fb922f565b65d92365a8d390
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Oct 10 22:27:40 2011 +0200

Clone CaolÃ¡n's work for wntgcci.mk too

diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 5fe8bbd..3831c85 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -79,10 +79,10 @@ CDEFS+=-D_DLL
 .ENDIF
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
+CFLAGSWARNBOTH=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCC=$(CFLAGSWARNBOTH) -Wdeclaration-after-statement
+CFLAGSWARNCXX=$(CFLAGSWARNBOTH) -Wshadow -Wno-ctor-dtor-privacy \
 -Wno-non-virtual-dtor
-CFLAGSWARNCC+=-Wdeclaration-after-statement
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
 CFLAGSWERRCC=-Werror -DLIBO_WERROR
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2011-09-27 Thread Thorsten Behrens

 solenv/inc/extension_helplink.mk |4 ++--
 solenv/inc/extension_post.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1b5bcb6562abc4fe684fe4e046bde93df1af3d12
Author: Thorsten Behrens tbehr...@novell.com
Date:   Tue Sep 27 12:16:55 2011 +0200

Make extension cross-buildable again.

diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk
index c9fa15e..df61f42 100644
--- a/solenv/inc/extension_helplink.mk
+++ b/solenv/inc/extension_helplink.mk
@@ -74,6 +74,6 @@ $(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) 
$(XHPLINKSRC)/$$(@:b:s/_/./
 $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp $(my_cp) 
com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod 
$(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} 
-checkcfsandsegname _0 _3   $(TOUCH) $@
 .ENDIF
 .ELSE
--$(RM) $(XHPLINKSRC)/$(@:b)/content/*.*
--$(RM) $(XHPLINKSRC)/$(@:b)/caption/*.*
+-$(RM) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/content/*.*
+-$(RM) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/caption/*.*
 .ENDIF
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 82421e2..ca65e5a 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -161,7 +161,7 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
 .IF $(GUI) == WNT
 PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/license.txt
 .ELSE  # $(GUI) == WNT
-PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE
+PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/LICENSE
 .ENDIF # $(GUI) == WNT
 .ELSE  # $(CUSTOM_LICENSE) == 
 PACKLICDEPS=$(CUSTOM_LICENSE)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: solenv/inc

16 matches

Site Navigation

Mail list logo

Footer information