diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-03 21:36:52 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-06-04 12:01:10 +0200 |
| commit | c05b9d3e2c5a4c88b67657c513255c2181658e4c (patch) | |
| tree | 223724949f227a548a49ab1fcce1e2312e7a6005 /odk | |
| parent | 4146cef50c1d56df0f18878732c01c0d968f6163 (diff) | |
odk: use SHORT_NAMES on Windows
Unfortnately the MSI stuff complains that lines in ddf files are too
long, so we need to use SHORT_NAMES. But use it only on Windows because
the file names are mostly just numbers then and totally unpredictable;
the documentation for the website must not be built on Windows.
Change-Id: I5d7d917bf34c55424259cf04bb13cb8c26fe409b
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_doxygen.mk | 1 | ||||
| -rw-r--r-- | odk/pack/gendocu/idl/Doxyfile | 3 | ||||
| -rw-r--r-- | odk/util/check.pl | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 0577d1765efe..fe60a6ba15d7 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -81,6 +81,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \ -e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \ -e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),NO,YES)!' \ -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(call odk_cygwin_path,$(odk_idl_PREFIX))!' \ + -e 's!^SHORT_NAMES = %$$!SHORT_NAMES = $(if $(filter WNT,$(OS)),YES,NO)!' \ $< > $@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/doxygen.log : \ diff --git a/odk/pack/gendocu/idl/Doxyfile b/odk/pack/gendocu/idl/Doxyfile index 14ff337b4ead..6eead549a380 100644 --- a/odk/pack/gendocu/idl/Doxyfile +++ b/odk/pack/gendocu/idl/Doxyfile @@ -21,6 +21,9 @@ WARNINGS = YES WARN_IF_DOC_ERROR = YES WARN_FORMAT = "$file:$line: $text" +# Do this only on Windows - the MSI has some ridiculous path name length +# restrictions - but not other platforms because short names are pretty random +SHORT_NAMES = % # for windows? actually should NOT need this - no case collision in files! # note this changes filenames (uppercase letters translated to "_lowercase") #CASE_SENSE_NAMES = NO diff --git a/odk/util/check.pl b/odk/util/check.pl index 5a2df1681dc9..00f542234426 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -345,6 +345,8 @@ if (-d "$SdkDir") { "xml/xpath", "xsd" ); + # Due to MSI limitations have to use SHORT_NAMES on windows so can't check + if ($OperatingSystem ne "windows") { foreach $i (@idl_dirlist) { if (!check_dir("docs/common/ref/com/sun/star/$i")) { @@ -354,6 +356,7 @@ if (-d "$SdkDir") { print "+"; } } + } } else { $return++; } |