Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Create submodule for MacFUSE libosxfuse_i32/libosxfuse_i64 adapter

  • Loading branch information...
commit e7385c1a7f8f45a08108d59b480696dfef78e5d2 1 parent e91c13a
Benjamin Fleischer bfleischer authored
Showing with 13 additions and 3 deletions.
  1. +3 −0  .gitmodules
  2. +8 −2 build.sh
  3. +1 −1  fuse
  4. +1 −0  macfuse
3  .gitmodules
View
@@ -7,6 +7,9 @@
[submodule "kext"]
path = kext
url = ../kext.git
+[submodule "macfuse"]
+ path = macfuse
+ url = ../fuse.git
[submodule "prefpane"]
path = prefpane
url = ../prefpane.git
10 build.sh
View
@@ -1431,6 +1431,12 @@ function m_handler_smalldist()
false
m_exit_on_error "cannot access directory '$lib_dir'."
fi
+ local lib_dir_mf="$m_srcroot"/macfuse
+ if [ ! -d "$lib_dir_mf" ]
+ then
+ false
+ m_exit_on_error "cannot access directory '$lib_dir_mf'."
+ fi
local kernel_dir="$m_srcroot"/kext
if [ ! -d "$kernel_dir" ]
@@ -1441,7 +1447,7 @@ function m_handler_smalldist()
if [ "$m_shortcircuit" != "1" ]
then
- rm -rf "$lib_dir/build/"
+ rm -rf "$lib_dir_mf/build/"
rm -rf "$kernel_dir/build/"
rm -rf "$m_srcroot/framework/build/"
fi
@@ -1655,7 +1661,7 @@ function m_handler_smalldist()
m_log "building MacFUSE compatibility layer for user-space OSXFUSE library"
- cd "$lib_dir"
+ cd "$lib_dir_mf"
m_exit_on_error "cannot access compatibility layer directory."
xcodebuild -target libmacfuse -configuration "$m_configuration" GCC_VERSION="$m_compiler" ARCHS="$m_archs" SDKROOT="$m_usdk_dir" MACOSX_DEPLOYMENT_TARGET="$m_platform" OSXFUSE_BUILD_ROOT="$ms_osxfuse_root" >$m_stdout 2>$m_stderr
2  fuse
@@ -1 +1 @@
-Subproject commit 83dfb06146615b6adc96b1e35aa4eb294d33ff36
+Subproject commit 18882f6daf4a2cc49e55e255bee9a31960df28ce
1  macfuse
@@ -0,0 +1 @@
+Subproject commit f340bc472375cf7fc8f2959330b83889ec7e9ad6
Please sign in to comment.
Something went wrong with that request. Please try again.