Kaydet (Commit) c05b9d3e authored tarafından Michael Stahl's avatar Michael Stahl

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
üst 4146cef5
...@@ -81,6 +81,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \ ...@@ -81,6 +81,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \
-e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \ -e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \
-e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),NO,YES)!' \ -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!^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 : \ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/doxygen.log : \
......
...@@ -21,6 +21,9 @@ WARNINGS = YES ...@@ -21,6 +21,9 @@ WARNINGS = YES
WARN_IF_DOC_ERROR = YES WARN_IF_DOC_ERROR = YES
WARN_FORMAT = "$file:$line: $text" 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! # for windows? actually should NOT need this - no case collision in files!
# note this changes filenames (uppercase letters translated to "_lowercase") # note this changes filenames (uppercase letters translated to "_lowercase")
#CASE_SENSE_NAMES = NO #CASE_SENSE_NAMES = NO
......
...@@ -345,6 +345,8 @@ if (-d "$SdkDir") { ...@@ -345,6 +345,8 @@ if (-d "$SdkDir") {
"xml/xpath", "xml/xpath",
"xsd" ); "xsd" );
# Due to MSI limitations have to use SHORT_NAMES on windows so can't check
if ($OperatingSystem ne "windows") {
foreach $i (@idl_dirlist) foreach $i (@idl_dirlist)
{ {
if (!check_dir("docs/common/ref/com/sun/star/$i")) { if (!check_dir("docs/common/ref/com/sun/star/$i")) {
...@@ -354,6 +356,7 @@ if (-d "$SdkDir") { ...@@ -354,6 +356,7 @@ if (-d "$SdkDir") {
print "+"; print "+";
} }
} }
}
} else { } else {
$return++; $return++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment