#i111682# remove module fondu for good

3 files changed, 3 insertions, 174 deletions

diff --git a/instsetoo_native/macosx/application/PostInstall.applescript b/instsetoo_native/macosx/application/PostInstall.applescript
index 3c302ab2daad..f7927f2d127b 100644
--- a/instsetoo_native/macosx/application/PostInstall.applescript
+++ b/instsetoo_native/macosx/application/PostInstall.applescript
@@ -27,9 +27,8 @@
 
 -- This is the PostInstall -script for .pkg installation
 -- 
--- Currently this script does the following things:
---   1) Uses fondu to extract and convert .dfont -fonts from Mac OS X system to .ttf -fonts for OpenOffice.org
-
+-- This script used to run fondu, but currently it does nothing
+-- Keeping it around as the remaining framework might become useful again
 
 (*==== (global variables as get-functions) ====*)
 
@@ -45,51 +44,10 @@ on getOOProgramPath()
 	return (getOOInstallPath() & "MacOS:")
 end getOOProgramPath
 
--- OSXSystemFontPathList : {"/System/Library/Fonts/", "/Library/Fonts/"}
--- OSXUserFontPathList : {"~/Library/Fonts/"}
-
-on getOSXSystemFontPathList()
-	return {(path to fonts folder from system domain) as string, Â
-		(path to fonts folder from local domain) as string}
-end getOSXSystemFontPathList
-
-on getOSXUserFontPathList()
-	return {(path to fonts folder from user domain) as string}
-end getOSXUserFontPathList
-
-on getOOSystemFontPath()
-	return (getOOInstallPath() & "share:fonts:truetype:")
-end getOOSystemFontPath
-
 on getOOUserSettingsPath()
 	return (((path to home folder) as string) & "Library:Application Support:OpenOffice.org:%USERDIRPRODUCTVERSION:")
 end getOOUserSettingsPath
 
-on getOOUserFontPath()
-	return (getOOUserSettingsPath() & "user:fonts:")
-end getOOUserFontPath
-
-
-on getOOCookieSystemFondu()
-	-- nosystemfondu : file does exist if user does not want to use fondu for system fonts
-	return "no_system_fondu"
-end getOOCookieSystemFondu
-
-on getOOCookieSystemFonduDone()
-	-- systemfondudone : file does exist if native fonts already extracted from system fonts
-	return "system_fondu_done"
-end getOOCookieSystemFonduDone
-
-on getOOCookieUserFondu()
-	-- nouserfondu : file does exist if user does not want to use fondu for user fonts
-	return "no_user_fondu"
-end getOOCookieUserFondu
-
-on getOOCookieUserFonduDone()
-	-- userfondudone : file does exist if native fonts already extracted from user fonts
-	return "user_fondu_done"
-end getOOCookieUserFonduDone
-
 --
 -- the default handler: run
 --
@@ -102,9 +60,7 @@ on run
 	end if
 	
 	-- checks are ok, now we can start doing the real stuff
-	firstLaunch()
-	runSystemFondu()
-	runUserFondu()
+--	doSomething()
 	
 	return
 end run
@@ -112,123 +68,6 @@ end run
 
 -------------------------------------------------------------
 
-
-on runSystemFondu()
-	-- check if user does not want font conversion 
-	if (isRealPath(getOOSystemFontPath() & getOOCookieSystemFondu())) then
-		return
-	end if
-	
-	-- check if font conversion was already run
-	if (isRealPath(getOOSystemFontPath() & getOOCookieSystemFonduDone())) then
-		return
-	end if
-	
-	logEvent("(scripts/PostInstall) Extracting system fonts...")
-	-- else try to create footprint
-	if (setCookie(getOOSystemFontPath(), getOOCookieSystemFonduDone())) then
-		-- call fondu for each font (i.e. without wildcard), so if it crashes only one font is missing
-		fonduConvertFonts(getOOSystemFontPath(), getOSXSystemFontPathList())
-	end if
-	logEvent("(scripts/PostInstall) Extracting system fonts completed.")
-end runSystemFondu
-
-
-on runUserFondu()
-	-- check if user does not want font conversion 
-	if (isRealPath(getOOUserFontPath() & getOOCookieUserFondu())) then
-		return
-	end if
-	
-	-- check if font conversion was already run
-	if (isRealPath(getOOUserFontPath() & getOOCookieUserFonduDone())) then
-		return
-	end if
-	
-	logEvent("(scripts/PostInstall) Extracting user fonts...")
-	-- try to create footprint
-	if (setCookie(getOOUserFontPath(), getOOCookieUserFonduDone())) then
-		-- call fondu for each font (i.e. without wildcard), so if it crashes only one font is missing
-		fonduConvertFonts(getOOUserFontPath(), getOSXUserFontPathList())
-	end if
-	logEvent("(scripts/PostInstall) Extracting user fonts completed.")
-end runUserFondu
-
-
-on firstLaunch()
-	-- continue only if OOSysFontdir exists	
-	if (not isRealPath(getOOSystemFontPath())) then
-		logEvent("(scripts/PostInstall) ERROR: could not find System font folder from " & POSIX path of getOOSystemFontPath())
-		return
-	end if
-	
-	if (setCookie(getOOSystemFontPath(), getOOCookieSystemFondu() & ".in_progress")) then
-		-- Has user already decided that he does not want to extract system fonts ?
-		if (not isRealPath(getOOSystemFontPath() & getOOCookieSystemFondu())) then
-			-- Are system fonts already extracted ?
-			if (not isRealPath(getOOSystemFontPath() & getOOCookieSystemFonduDone())) then
-				-- ask if the user wants to use fondu to extract system fonts
-				set yesKey to getMessage("YES_KEY")
-				set noKey to getMessage("NO_KEY")
-				display dialog getMessage("OOO_EXTRACT_NATIVE_SYSFONTS") buttons {noKey, yesKey} default button yesKey
-				set theResult to the button returned of the result
-				if theResult is noKey then
-					-- not use fondu for system fonts extraction !
-					setCookie(getOOSystemFontPath(), getOOCookieSystemFondu())
-					logEvent("(scripts/PostInstall) Setting: no system fonts")
-				end if
-			end if
-		end if
-	end if
-	
-	-- continue only if OOUserFontdir exists	
-	if (not isRealPath(getOOUserFontPath())) then
-		logEvent("(scripts/PostInstall) ERROR: could not find User font folder from " & POSIX path of getOOUserFontPath())
-		return
-	end if
-	
-	-- Has user already decided that he does not want to extract user fonts ?
-	if (not isRealPath(getOOUserFontPath() & getOOCookieUserFondu())) then
-		-- Are system fonts already extracted ?
-		if (not isRealPath(getOOUserFontPath() & getOOCookieUserFonduDone())) then
-			-- ask if the user wants to use fondu to extract user fonts
-			set yesKey to getMessage("YES_KEY")
-			set noKey to getMessage("NO_KEY")
-			display dialog getMessage("OOO_EXTRACT_NATIVE_USERFONTS") buttons {noKey, yesKey} default button yesKey
-			set theResult to the button returned of the result
-			if theResult is noKey then
-				-- not use fondu for user fonts extraction !
-				setCookie(getOOUserFontPath(), getOOCookieUserFondu())
-				logEvent("(scripts/PostInstall) Setting: no user fonts")
-			end if
-		end if
-	end if
-	
-end firstLaunch
-
-
-on fonduConvertFonts(targetPath, sourcePathList)
-	
-	-- define the location of fondu
-	set fondu to quoted form of (POSIX path of getOOProgramPath() & "fondu")
-	
-	-- first go to the target directory
-	set fonduCmd to "cd " & (quoted form of POSIX path of targetPath) & "; "
-	
-	repeat with q from 1 to number of items in sourcePathList
-		set aPath to POSIX path of (item q of sourcePathList)
-		set fonduCmd to fonduCmd & "for i in " & aPath & "*; do " & fondu & " -force \"$i\" >> /dev/null 2>&1; done; "
-	end repeat
-	try
-		-- ignore errors
-		-- with admin privileges does not work well on panther
-		do shell script "sh -c " & quoted form of fonduCmd
-	end try
-	logEvent("fonduCMD: " & fonduCmd)
-	
-end fonduConvertFonts
-
-
 (* ===== (Helper functions) ======= *)
 
 -- set a cookiefile. The content is empty.
diff --git a/ooo.lst b/ooo.lst
index 4d1199fd9ef4..678a4ccdd638 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -14,7 +14,6 @@ http://hg.services.openoffice.org/binaries
 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-2dfbbf27a5822eeabaeacdf16d7c41e7-fondu_src-051010.tar.gz
 2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
 ef9ab6c1740682fbd730606d5f6922e6-liberation-fonts-ttf-1.05.3.20100427.zip
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 19a15f7fcc11..58f4ee45245a 100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1777,15 +1777,6 @@ File gid_File_Spotlight_Bundle
 End
 #endif
 
-#if defined MACOSX && !defined QUARTZ
-File gid_File_Bin_Fondu
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "fondu";
-    Styles = (PACKED);
-End
-#endif
-
 File gid_File_Config_Javasettingsunopkginstall
     USER_FILE_BODY;
     Dir = gid_Dir_Config;