You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2012/01/31 17:35:07 UTC
svn commit: r1238684 - in /incubator/ooo/trunk/main: boost/makefile.mk
configure.in icc/makefile.mk instsetoo_native/util/makefile.mk
odk/util/makefile.pmk solenv/inc/unitools.mk
Author: pfg
Date: Tue Jan 31 16:35:07 2012
New Revision: 1238684
URL: http://svn.apache.org/viewvc?rev=1238684&view=rev
Log:
Reduce the dependencies on non standard GNU copy.
Excessive dependence on GNU cp for non-GNU platforms is inconvenient
as it involves installing the complete GNU coreutils package. This
can be avoided by using less non-portable extensions.
- "cp -R" tends to be more portable than "cp -r"
- Avoid using "cp -u".
At this time this changes are focused on FreeBSD based
on the work done already for MacOSX.
Modified:
incubator/ooo/trunk/main/boost/makefile.mk
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/icc/makefile.mk
incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk
incubator/ooo/trunk/main/odk/util/makefile.pmk
incubator/ooo/trunk/main/solenv/inc/unitools.mk
Modified: incubator/ooo/trunk/main/boost/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/boost/makefile.mk?rev=1238684&r1=1238683&r2=1238684&view=diff
==============================================================================
--- incubator/ooo/trunk/main/boost/makefile.mk (original)
+++ incubator/ooo/trunk/main/boost/makefile.mk Tue Jan 31 16:35:07 2012
@@ -75,28 +75,28 @@ NORMALIZE_FLAG_FILE=so_normalized_$(TARG
$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
-@$(MKDIRHIER) $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/preprocessor $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/ptr_container $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/range $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/spirit $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/type_traits $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/utility $(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/variant $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/preprocessor $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/ptr_container $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/range $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/spirit $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/type_traits $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/utility $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/variant $(INCCOM)$/$(PRJNAME)
@$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1238684&r1=1238683&r2=1238684&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Tue Jan 31 16:35:07 2012
@@ -30,7 +30,7 @@ AC_ARG_WITH(gnu-patch,
[ --with-gnu-patch Specify location of GNU patch on Solaris or FreeBSD
],,)
AC_ARG_WITH(gnu-cp,
-[ --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD
+[ --with-gnu-cp Specify location of GNU cp on Solaris
],,)
AC_ARG_WITH(gperf,
[ --with-gperf Specify location of gperf on Solaris or FreeBSD
@@ -5575,7 +5575,7 @@ fi
dnl We also need to check for --with-gnu-cp
if test -z "$with_gnu_cp"; then
- # check the place where the good stuff is hidden on Solaris...
+ # check the place where the GNU stuff is hidden on Solaris...
if test -x /usr/gnu/bin/cp; then
GNUCP=/usr/gnu/bin/cp
else
@@ -5601,7 +5601,7 @@ else
fi
if test -z "$GNUCP"; then
- if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then
+ if test "$_os" = "SunOS"; then
AC_MSG_ERROR([no, GNU cp from coreutils is needed. install or specify with --with-gnu-cp=/path/to/it])
else
AC_MSG_RESULT([no GNU cp from coreutils found - using the system's cp command])
Modified: incubator/ooo/trunk/main/icc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/icc/makefile.mk?rev=1238684&r1=1238683&r2=1238684&view=diff
==============================================================================
--- incubator/ooo/trunk/main/icc/makefile.mk (original)
+++ incubator/ooo/trunk/main/icc/makefile.mk Tue Jan 31 16:35:07 2012
@@ -42,7 +42,7 @@ CONVERTFILES= \
Contrib$/ICC_utils$/Stubs.h \
Contrib$/ICC_utils$/Vetters.cpp
-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip
+CONFIGURE_ACTION= $(GNUCOPY) -R $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip
BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
# --- Targets ------------------------------------------------------
Modified: incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk?rev=1238684&r1=1238683&r2=1238684&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk Tue Jan 31 16:35:07 2012
@@ -260,14 +260,14 @@ hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
- $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
- $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
- $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
- $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
- $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
- $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
- $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
- $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
+ $(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
+ $(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
+ $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
+ $(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
+ $(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
+ $(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
+ $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
+ $(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
Modified: incubator/ooo/trunk/main/odk/util/makefile.pmk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/odk/util/makefile.pmk?rev=1238684&r1=1238683&r2=1238684&view=diff
==============================================================================
--- incubator/ooo/trunk/main/odk/util/makefile.pmk (original)
+++ incubator/ooo/trunk/main/odk/util/makefile.pmk Tue Jan 31 16:35:07 2012
@@ -68,11 +68,11 @@ MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRA
.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
MY_COPY=$(GNUCOPY)
-MY_COPY_RECURSIVE=$(GNUCOPY) -r
+MY_COPY_RECURSIVE=$(GNUCOPY) -R
.ELSE
.IF "$(OS)"=="MACOSX"
MY_COPY=$(GNUCOPY)
-MY_COPY_RECURSIVE=$(GNUCOPY) -r
+MY_COPY_RECURSIVE=$(GNUCOPY) -R
.ELSE
MY_COPY=$(GNUCOPY) -u
MY_COPY_RECURSIVE=$(GNUCOPY) -urf
Modified: incubator/ooo/trunk/main/solenv/inc/unitools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/unitools.mk?rev=1238684&r1=1238683&r2=1238684&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/unitools.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/unitools.mk Tue Jan 31 16:35:07 2012
@@ -103,9 +103,9 @@ PERL*=perl
TYPE=cat
CDD=cd
COPY=cp -f
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
COPYRECURSE=-R
-.ELSE #"$(OS)"=="MACOSX"
+.ELSE # Not BSD based
COPYRECURSE=-r
.ENDIF
.IF "$(OS)"=="SOLARIS"