diff --git a/.Rbuildignore b/.Rbuildignore index d77493b..fd19815 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -13,3 +13,5 @@ ^\.vscode$ ^\.claude$ ^CLAUDE.md$ +^w-build$ +^w-install$ diff --git a/.gitignore b/.gitignore index 7526f87..0cdc162 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,8 @@ .Rhistory .RData .Ruserdata -/build/ -/install/ +/w-build/ +/w-install/ /docs/ /revdep/ /.claude/ diff --git a/cleanup b/cleanup index 58dfa7b..abb582c 100755 --- a/cleanup +++ b/cleanup @@ -1,2 +1,2 @@ #!/bin/sh -rm -rf src/Makevars build install +rm -rf src/Makevars w-build w-install diff --git a/cleanup.win b/cleanup.win index b2e64d2..9c75dc1 100755 --- a/cleanup.win +++ b/cleanup.win @@ -1 +1 @@ -rm -rf src/Makevars build install +rm -rf src/Makevars w-build w-install diff --git a/configure b/configure index 40f71a5..dda384a 100755 --- a/configure +++ b/configure @@ -97,8 +97,8 @@ fi if [ $compile_fswatch -eq 1 ]; then echo "Compiling 'libfswatch' from source ..." detect_cmake - cmake -S src/fswatch -B build \ - -DCMAKE_INSTALL_PREFIX=install \ + cmake -S src/fswatch -B w-build \ + -DCMAKE_INSTALL_PREFIX=w-install \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ @@ -106,14 +106,14 @@ if [ $compile_fswatch -eq 1 ]; then -DCMAKE_INSTALL_MESSAGE=NEVER \ -DBUILD_LIBS_ONLY=1 \ -DUSE_NLS=0 - cmake --build build --target install - rm -rf build + cmake --build w-build --target install + rm -rf w-build fi # Set flags for bundled library -if [ -d "install/lib" ]; then - PKG_CFLAGS="-I../install/include $PKG_CFLAGS" - PKG_LIBS="../install/lib/libfswatch.a $PKG_LIBS" +if [ -d "w-install/lib" ]; then + PKG_CFLAGS="-I../w-install/include $PKG_CFLAGS" + PKG_LIBS="../w-install/lib/libfswatch.a $PKG_LIBS" fi # Write to Makevars diff --git a/configure.ucrt b/configure.ucrt index 26950fb..89cbfca 100755 --- a/configure.ucrt +++ b/configure.ucrt @@ -6,8 +6,8 @@ LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS` export CC CFLAGS CPPFLAGS LDFLAGS echo "Compiling 'libfswatch' from source ..." -cmake -S src/fswatch -B build -G "Unix Makefiles" \ - -DCMAKE_INSTALL_PREFIX=install \ +cmake -S src/fswatch -B w-build -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=w-install \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ @@ -15,8 +15,8 @@ cmake -S src/fswatch -B build -G "Unix Makefiles" \ -DCMAKE_INSTALL_MESSAGE=NEVER \ -DBUILD_LIBS_ONLY=1 \ -DUSE_NLS=0 -cmake --build build --target install -rm -rf build +cmake --build w-build --target install +rm -rf w-build # Success exit 0 diff --git a/configure.win b/configure.win index 01cb830..12ac227 100755 --- a/configure.win +++ b/configure.win @@ -8,8 +8,8 @@ for ARCH in x64 i386; do export CC CFLAGS CPPFLAGS LDFLAGS echo "Compiling 'libfswatch' from source for ${ARCH} ..." - cmake -S src/fswatch -B build -G "Unix Makefiles" \ - -DCMAKE_INSTALL_PREFIX=install/${ARCH} \ + cmake -S src/fswatch -B w-build -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=w-install/${ARCH} \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ @@ -17,8 +17,8 @@ for ARCH in x64 i386; do -DCMAKE_INSTALL_MESSAGE=NEVER \ -DBUILD_LIBS_ONLY=1 \ -DUSE_NLS=0 - cmake --build build --target install - rm -rf build + cmake --build w-build --target install + rm -rf w-build else echo "Note: ${ARCH} not installed, skipping ..." diff --git a/src/Makevars.in b/src/Makevars.in index 7f3a2f4..7530c82 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -4,12 +4,12 @@ PKG_LIBS = @libs@ SOURCES = init.c watcher.c OBJECTS = $(SOURCES:.c=.o) -.PHONY: all clean-archives clean +.PHONY: all cleanup clean -all: clean-archives +all: cleanup -clean-archives: $(SHLIB) - @rm -f ../install/lib/*.a +cleanup: $(SHLIB) + @rm -rf ../w-install $(SHLIB): $(OBJECTS) diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt index 5facada..8ab10a1 100644 --- a/src/Makevars.ucrt +++ b/src/Makevars.ucrt @@ -1,15 +1,15 @@ -PKG_CFLAGS = -I../install/include $(C_VISIBILITY) -PKG_LIBS = ../install/lib/libfswatch.a -pthread +PKG_CFLAGS = -I../w-install/include $(C_VISIBILITY) +PKG_LIBS = ../w-install/lib/libfswatch.a -pthread SOURCES = init.c watcher.c OBJECTS = $(SOURCES:.c=.o) -.PHONY: all clean-archives clean +.PHONY: all cleaup clean -all: clean-archives +all: cleanup -clean-archives: $(SHLIB) - @rm -f ../install/lib/*.a +cleanup: $(SHLIB) + @rm -rf ../w-install $(SHLIB): $(OBJECTS) diff --git a/src/Makevars.win b/src/Makevars.win index d59ec4f..b1dd878 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,15 +1,15 @@ -PKG_CFLAGS = -I../install${R_ARCH}/include $(C_VISIBILITY) -PKG_LIBS = ../install${R_ARCH}/lib/libfswatch.a -pthread -lstdc++fs +PKG_CFLAGS = -I../w-install${R_ARCH}/include $(C_VISIBILITY) +PKG_LIBS = ../w-install${R_ARCH}/lib/libfswatch.a -pthread -lstdc++fs SOURCES = init.c watcher.c OBJECTS = $(SOURCES:.c=.o) -.PHONY: all clean-archives clean +.PHONY: all cleanup clean -all: clean-archives +all: cleanup -clean-archives: $(SHLIB) - @rm -f ../install${R_ARCH}/lib/*.a +cleanup: $(SHLIB) + @rm -rf ../w-install${R_ARCH} $(SHLIB): $(OBJECTS)