Use etc\fonts\fonts.conf - run fc-cache on install

* it spawns a dos console to run fc-cache - good for debugging
shoes · Mar 10, 2015 · 1028d81 · 1028d81
1 parent 77c19f8
commit 1028d81
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/make/win7/tasks.rb b/make/win7/tasks.rb
@@ -106,8 +106,6 @@ def pre_build
         "#{TGT_DIR}/share/glib-2.0/schemas"
     end
     sh "#{WINDRES} -I. shoes/appwin32.rc shoes/appwin32.o"
-    cp "#{ShoesDeps}/etc/fonts/fonts.conf", TGT_DIR # at root level
-    cp_r "#{ShoesDeps}/etc/fonts/conf.d", TGT_DIR  # need at root? 
     cp_r "#{ShoesDeps}/etc", TGT_DIR
     mkdir_p "#{ShoesDeps}/lib"
     cp_r "#{ShoesDeps}/lib/gtk-2.0", "#{TGT_DIR}/lib" #  shoes, exerb, ruby here

diff --git a/make/xwin7/tasks.rb b/make/xwin7/tasks.rb
@@ -84,8 +84,6 @@ def pre_build
         "#{TGT_DIR}/share/glib-2.0/schemas"
     end
     sh "#{WINDRES} -I. shoes/appwin32.rc shoes/appwin32.o"
-    cp "#{ShoesDeps}/etc/fonts/fonts.conf", TGT_DIR # at root level
-    cp_r "#{ShoesDeps}/etc/fonts/conf.d", TGT_DIR  # need at root? 
     cp_r "#{ShoesDeps}/etc", TGT_DIR
     mkdir_p "#{ShoesDeps}/lib"
     cp_r "#{ShoesDeps}/lib/gtk-2.0", "#{TGT_DIR}/lib" #  shoes, exerb, ruby here

diff --git a/platform/msw/base.nsi b/platform/msw/base.nsi
@@ -85,8 +85,10 @@ Section "MainSection" SEC01
    File /r /x nsis ..\*.*
 
    ${EnvVarUpdate} $0 "PATH" "A" HKLM $INSTDIR
-   ${EnvVarUpdate} $0 "FONTCONFIG_FILE" "A" HKLM "$INSTDIR\fonts.conf"
+   ${EnvVarUpdate} $0 "FONTCONFIG_FILE" "A" HKLM "$INSTDIR\etc\fonts\fonts.conf"
    ${registerExtension} "$INSTDIR\${SHOES_NAME}.exe" ".shy" "Shoes Application"
+   DetailPrint "Building font cache, this may take a while..."
+   ExecWait '"$INSTDIR\fc-cache.exe" "-f"'
 SectionEnd
 
 Section -AdditionalIcons
@@ -124,7 +126,7 @@ Section Uninstall
 
    ${unregisterExtension} ".shy" "Shoes Application"
    ${un.EnvVarUpdate} $0 "PATH" "R" HKLM $INSTDIR
-   ${un.EnvVarUpdate} $0 "FONTCONFIG_FILE" "R" HKLM "$INSTDIR\fonts.conf"
+   ${un.EnvVarUpdate} $0 "FONTCONFIG_FILE" "R" HKLM "$INSTDIR\etc\fonts\fonts.conf"
 
    DeleteRegKey ${SHOES_UNINST_ROOT_KEY} "${SHOES_UNINST_KEY}"
    DeleteRegKey HKLM "${SHOES_INST_KEY}"