incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1162595 - in /incubator/ooo/trunk/main: lingucomponent/source/spellcheck/macosxspell/makefile.mk postprocess/packcomponents/makefile.mk scp2/source/ooo/file_library_ooo.scp
Date Sun, 28 Aug 2011 21:27:22 GMT
Author: erack
Date: Sun Aug 28 21:27:22 2011
New Revision: 1162595

URL: http://svn.apache.org/viewvc?rev=1162595&view=rev
Log:
DISABLE_HUNSPELL for MacOSX specific parts

Thanks to Pavel Janik.

Modified:
    incubator/ooo/trunk/main/lingucomponent/source/spellcheck/macosxspell/makefile.mk
    incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp

Modified: incubator/ooo/trunk/main/lingucomponent/source/spellcheck/macosxspell/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/lingucomponent/source/spellcheck/macosxspell/makefile.mk?rev=1162595&r1=1162594&r2=1162595&view=diff
==============================================================================
--- incubator/ooo/trunk/main/lingucomponent/source/spellcheck/macosxspell/makefile.mk (original)
+++ incubator/ooo/trunk/main/lingucomponent/source/spellcheck/macosxspell/makefile.mk Sun
Aug 28 21:27:22 2011
@@ -48,6 +48,8 @@ CFLAGSCC += $(HUNSPELL_CFLAGS)
 
 # --- Files --------------------------------------------------------
 
+.IF "$(DISABLE_HUNSPELL)" == ""
+
 CFLAGSCXX+=$(OBJCXXFLAGS)
 CFLAGSCXX+=-I..$/..$/lingutil
 
@@ -88,6 +90,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component
 .INCLUDE : target.mk
 
 .ELSE
+all:
+	@echo "hunspell disabled"
+.ENDIF
+
+.ELSE
 dummy:
 	@echo " Nothing to build for GUIBASE=$(GUIBASE)"
 .ENDIF

Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1162595&r1=1162594&r2=1162595&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Sun Aug 28 21:27:22 2011
@@ -296,11 +296,16 @@ my_components += \
 
 .IF "$(OS)" == "MACOSX"
 my_components += \
-    MacOSXSpell \
     avmediaQuickTime \
     fps_aqua \
     macab1 \
     macbe1
+
+.IF "$(DISABLE_HUNSPELL)" == ""
+my_components += \
+    MacOSXSpell
+.END
+
 .END
 
 .IF "$(OS)" == "WNT"

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1162595&r1=1162594&r2=1162595&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Sun Aug 28 21:27:22 2011
@@ -548,12 +548,14 @@ File gid_File_Lib_Fps_Aqua
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
 End
 
+#ifndef DISABLE_HUNSPELL
 File gid_File_Lib_MacOSXSpell
 	TXT_FILE_BODY;
 	Styles = (PACKED);
 	Name = LIBNAME(MacOSXSpell);
 	Dir = SCP2_OOO_BIN_DIR;
 End
+#endif
 
 File gid_File_Lib_avmediaQuickTime
 	TXT_FILE_BODY;



Mime
View raw message