Hi, The attached patch allowed me to build and dev-install (wikihelp opens properly) master without cloning the help repo (saving 20MB of download of something I don't need during development in most cases). The Android/iOS part is because Tor already introduced a "DESKTOP" build type where helpcontent2 was disabled. OK to push? Thanks.
From e3080e063acf9b61bc5cc8821e7c790759ca739d Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Thu, 11 Aug 2011 18:36:53 +0200
Subject: [PATCH] Make the help repo optional
---
configure.in | 18 +++++++++++++++++-
postprocess/prj/build.lst | 2 +-
scp2/source/base/file_base.scp | 2 ++
scp2/source/calc/file_calc.scp | 2 ++
scp2/source/draw/file_draw.scp | 2 ++
scp2/source/impress/file_impress.scp | 2 ++
scp2/source/math/file_math.scp | 2 ++
scp2/source/ooo/file_ooo.scp | 2 ++
scp2/source/writer/file_writer.scp | 2 ++
9 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index bab743e..f08d3b9 100755
--- a/configure.in
+++ b/configure.in
@@ -1018,6 +1018,12 @@ AC_ARG_WITH(gxx_include_path,
],
,)
+AC_ARG_WITH(help,
+ AS_HELP_STRING([--with-help],
+ [Enable the build of help.
+
+ To build without help, use --without-help.]))
+
AC_ARG_WITH(java,
AS_HELP_STRING([--with-java],
[Specify the name of the Java interpreter command. Typically "java"
@@ -1367,7 +1373,7 @@ AC_ARG_WITH(macosx-version-max-allowed,
BUILD_TYPE="LibO"
SCPDEFS=""
-GIT_REPO_NAMES="help"
+GIT_REPO_NAMES=""
echo "********************************************************************"
echo "*"
@@ -2279,6 +2285,16 @@ else
fi
AC_SUBST(WITH_BINFILTER)
+AC_MSG_CHECKING([whether to build help])
+if test "$with_help" != "no" -a $_os != iOS -a $_os != Android; then
+ AC_MSG_RESULT([yes])
+ BUILD_TYPE="$BUILD_TYPE HELP"
+ SCPDEFS="$SCPDEFS -DWITH_HELP"
+ GIT_REPO_NAMES="$GIT_REPO_NAMES help"
+else
+ AC_MSG_RESULT([no])
+fi
+
dnl Enable ugly pieces of code we're better off without
dnl ===================================================================
if test "$enable_ugly" = "yes"; then
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index ca84711..76685d6 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility DESKTOP:automation basctl bean BINFILTER:binfilter
configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm
eventattacher DESKTOP:extensions extras filter forms fpicker DESKTOP:helpcontent2 io
LIBRSVG:librsvg lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package
psprint_config remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools
ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries
PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder
LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver
STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility DESKTOP:automation basctl bean BINFILTER:binfilter
configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm
eventattacher DESKTOP:extensions extras filter forms fpicker HELP:helpcontent2 io LIBRSVG:librsvg
lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config
remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls
ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno
readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder
LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver
STLPORT:stlport LIBXSLT:libxslt tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 4da10dd..dbab1f4 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -72,12 +72,14 @@ STD_RES_FILE( gid_File_Res_Rptui, rptui)
STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
+#if defined WITH_HELP
File gid_File_Help_Sdatabase_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
Patchfiles = ();
End
+#endif
File gid_File_Share_Registry_Base_Xcd
TXT_FILE_BODY;
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index b1fd14b..a2f1fdb 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -65,12 +65,14 @@ STD_RES_FILE( gid_File_Res_Date, date)
STD_RES_FILE( gid_File_Res_Sc, sc )
+#if defined WITH_HELP
File gid_File_Help_Scalc_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(scalc);
Patchfiles = ();
End
+#endif
// new user interface configuration files
/*
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index ed5aa45..975b600 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -34,12 +34,14 @@ File gid_File_Share_Registry_Draw_Xcd
Name = "draw.xcd";
End
+#if defined WITH_HELP
File gid_File_Help_Sdraw_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdraw);
Patchfiles = ();
End
+#endif
File gid_File_Exe_Sdraw
BIN_FILE_BODY;
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 1e75942..074a479 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -44,12 +44,14 @@ File gid_File_Share_Registry_Impress_Xcd
Name = "impress.xcd";
End
+#if defined WITH_HELP
File gid_File_Help_Simpress_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
Patchfiles = ();
End
+#endif
File gid_File_Exe_Simpress
BIN_FILE_BODY;
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index c554296..8265088 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -50,12 +50,14 @@ File gid_File_Share_Registry_Math_Xcd
Name = "math.xcd";
End
+#if defined WITH_HELP
File gid_File_Help_Smath_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(smath);
Patchfiles = ();
End
+#endif
File gid_File_Exe_Smath
BIN_FILE_BODY;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index fb85ddf..d48bba1 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -351,6 +351,7 @@ STD_FILTER_FILE( gid_File_Filter_Iti, iti)
STD_RES_FILE( gid_File_Res_Eps, eps )
+#if defined WITH_HELP
File gid_File_Help_Common_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -376,6 +377,7 @@ File gid_File_Help_Schart_Zip
ARCHIVE_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
End
+#endif
#if defined WNT
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index ea65024..a1ae5ca 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -53,12 +53,14 @@ File gid_File_Exe_Sweb
End
#endif
+#if defined WITH_HELP
File gid_File_Help_Swriter_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(swriter);
Patchfiles = ();
End
+#endif
/*
File gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml
--
1.7.6
Attachment:
pgpWGVz9oM0gC.pgp
Description: PGP signature