Makefile.in | 14 --------------
README.cross | 4 ++--
configure.ac | 4 ++--
oox/source/drawingml/customshapes/README | 6 +++---
4 files changed, 7 insertions(+), 21 deletions(-)
New commits:
commit 0acc3300f14e7f961bc165f58e97d1f35164d781
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Aug 7 09:04:45 2014 +0300
If dev-install is obsolete, why have it at all?
Replace mentions of it in a few (dcumentation) places with test-install.
Change-Id: I6fc8e58fa5813b05de16feec35215c83e0e45834
diff --git a/Makefile.in b/Makefile.in
index 028c55c..0c9893c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,20 +277,6 @@ install-strip:
@$(call gb_Top_InstallFinished,Installation,$(INSTALLDIR))
endif # !MACOSX
-dev-install:
- @echo && echo "dev-install is obsolete! Just build with \"make check\"
and run"
-ifeq ($(OS),MACOSX)
- @echo " open instdir/$(PRODUCTNAME).app"
- @echo
- @echo "To debug: gdb instdir/$(PRODUCTNAME).app/Contents/MacOS/soffice"
-else
- @echo " instdir/program/soffice"
-endif
- @echo
- @echo "(only if you have good reason to test an actual installation:
make test-install)"
- @echo
- @false
-
test-install: build
@rm -rf $(TESTINSTALLDIR)
@mkdir -p $(TESTINSTALLDIR)
diff --git a/README.cross b/README.cross
index cfeaadc..5ad963f 100644
--- a/README.cross
+++ b/README.cross
@@ -220,9 +220,9 @@ TODO:
others; would be best to avoid that if at all possible (using a free
cab implementation, part of Wine or something)
- MSI generation
- - if at all possible, the make dev-install installation (with links
+ - if at all possible, the make test-install installation (with links
back to the build) should be done so that it would be directly
- executable via wine after doing make dev-install :-)
+ executable via wine after doing make test-install :-)
- runtime
- no idea if the entire thing works after the installation at all; I
diff --git a/configure.ac b/configure.ac
index 3aadd12..17c8d3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9868,7 +9868,7 @@ if test "$_os" = "WINNT" -a "$cross_compiling" != "yes";
then
if test "$WITH_MINGW" = "yes"; then
AC_PATH_PROG([UUIDGEN], [uuid])
if test -z "$UUIDGEN"; then
- AC_MSG_WARN([uuid is needed for dev-install])
+ AC_MSG_WARN([uuid is needed for test-install])
fi
else
# presence is already tested above in the WINDOWS_SDK_HOME check
@@ -9878,7 +9878,7 @@ if test "$_os" = "WINNT" -a "$cross_compiling" != "yes";
then
else
AC_PATH_PROG([UUIDGEN], [uuidgen])
if test -z "$UUIDGEN"; then
- AC_MSG_WARN([uuid is needed for dev-install])
+ AC_MSG_WARN([uuid is needed for test-install])
fi
fi
diff --git a/oox/source/drawingml/customshapes/README
b/oox/source/drawingml/customshapes/README
index 0b3ef8f..e537c24 100755
--- a/oox/source/drawingml/customshapes/README
+++ b/oox/source/drawingml/customshapes/README
@@ -10,9 +10,9 @@
set -o errexit
-# To re-generate the code, you need to be on Linux (I think). You need
-# to have done a make dev-install. oox needs to be build with
-# dbglevel=2 so that DEBUG is defined.
+# To re-generate the code, you need to be on Linux (I think). You
+# might need to have done a make test-install. oox needs to be build
+# with dbglevel=2 so that DEBUG is defined.
make oox.clean && make oox dbglevel=2
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
