clean up a little, no real changes

Author: asmagill

Diff for: Makefile

@@ -3,15 +3,16 @@ current_dir := $(notdir $(patsubst %/,%,$(dir $(mkfile_path))))
 
 MODULE := $(current_dir)
 PREFIX ?= ~/.hammerspoon
+VERSION ?= 0.x
 HS_APPLICATION ?= /Applications
 
 OBJCFILE = ${wildcard *.m}
 LUAFILE  = ${wildcard *.lua}
 HEADERS  = ${wildcard *.h}
 
 SOFILE  := $(OBJCFILE:.m=.so)
+# SOFILE  := internal.so
 DEBUG_CFLAGS ?= -g
-DOC_FILE = hs._asm.undocumented.$(MODULE).json
 
 # special vars for uninstall
 space :=
@@ -23,48 +24,52 @@ ALLFILES += $(SOFILE)
 .SUFFIXES: .m .so
 
 #CC=cc
-CC=clang
-EXTRA_CFLAGS ?= -Wconversion -Wdeprecated -F$(HS_APPLICATION)/Hammerspoon.app/Contents/Frameworks
-CFLAGS  += $(DEBUG_CFLAGS) -fmodules -fobjc-arc -DHS_EXTERNAL_MODULE -Wall -Wextra $(EXTRA_CFLAGS)
+CC=@clang
+WARNINGS ?= -Weverything -Wno-objc-missing-property-synthesis -Wno-implicit-atomic-properties -Wno-direct-ivar-access -Wno-cstring-format-directive -Wno-padded -Wno-covered-switch-default -Wno-missing-prototypes -Werror-implicit-function-declaration
+EXTRA_CFLAGS ?= -F$(HS_APPLICATION)/Hammerspoon.app/Contents/Frameworks -mmacosx-version-min=10.10
+
+CFLAGS  += $(DEBUG_CFLAGS) -fmodules -fobjc-arc -DHS_EXTERNAL_MODULE $(WARNINGS) $(EXTRA_CFLAGS)
 LDFLAGS += -dynamiclib -undefined dynamic_lookup $(EXTRA_LDFLAGS)
 
-DOC_SOURCES = $(LUAFILE) $(OBJCFILE)
+all: verify $(SOFILE)
 
-all: $(SOFILE)
+release: clean all
+	HS_APPLICATION=$(HS_APPLICATION) PREFIX=tmp make install ; cd tmp ; tar -cf ../$(MODULE)-v$(VERSION).tar hs ; cd .. ; gzip $(MODULE)-v$(VERSION).tar
 
-.m.so: $(HEADERS)
+.m.so: $(HEADERS) $(OBJCFILE)
 	$(CC) $< $(CFLAGS) $(LDFLAGS) -o $@
 
+# internal.so: $(HEADERS) $(OBJCFILE)
+# 	$(CC) $(OBJCFILE) $(CFLAGS) $(LDFLAGS) -o $@
+
 install: verify install-objc install-lua
 
 verify: $(LUAFILE)
-	luac-5.3 -p $(LUAFILE) && echo "Passed"
+	@if $$(hash lua-5.3 >& /dev/null); then (luac-5.3 -p $(LUAFILE) && echo "Lua Compile Verification Passed"); else echo "Skipping Lua Compile Verification"; fi
 
 install-objc: $(SOFILE)
 	mkdir -p $(PREFIX)/hs/_asm/undocumented/$(MODULE)
 	install -m 0644 $(SOFILE) $(PREFIX)/hs/_asm/undocumented/$(MODULE)
 	cp -vpR $(OBJCFILE:.m=.so.dSYM) $(PREFIX)/hs/_asm/undocumented/$(MODULE)
+# 	cp -vpR $(SOFILE:.so=.so.dSYM) $(PREFIX)/hs/_asm/undocumented/$(MODULE)
 
 install-lua: $(LUAFILE)
 	mkdir -p $(PREFIX)/hs/_asm/undocumented/$(MODULE)
 	install -m 0644 $(LUAFILE) $(PREFIX)/hs/_asm/undocumented/$(MODULE)
 
-docs: $(DOC_FILE)
+markdown:
+	hs -c "dofile(\"utils/docmaker.lua\").genMarkdown([[$(dir $(mkfile_path))]])" > README.tmp.md
 
-$(DOC_FILE): $(DOC_SOURCES)
-	find . -type f \( -name '*.lua' -o -name '*.m' \) -not -name 'template.*' -not -path './_*' -exec cat {} + | __doc_tools/gencomments | __doc_tools/genjson > $@
-
-install-docs: docs
-	mkdir -p $(PREFIX)/hs/_asm/undocumented/$(MODULE)
-	install -m 0644 $(DOC_FILE) $(PREFIX)/hs/_asm/undocumented/$(MODULE)
+markdownWithTOC:
+	hs -c "dofile(\"utils/docmaker.lua\").genMarkdown([[$(dir $(mkfile_path))]], true)" > README.tmp.md
 
 clean:
-	rm -v -rf $(SOFILE) *.dSYM $(DOC_FILE)
+	rm -rf $(SOFILE) *.dSYM tmp
 
 uninstall:
 	rm -v -f $(PREFIX)/hs/_asm/undocumented/$(MODULE)/{$(subst $(space),$(comma),$(ALLFILES))}
 	(pushd $(PREFIX)/hs/_asm/undocumented/$(MODULE)/ ; rm -v -fr $(OBJCFILE:.m=.so.dSYM) ; popd)
-	rm -v -f $(PREFIX)/hs/_asm/undocumented/$(MODULE)/$(DOC_FILE)
+# 	(pushd $(PREFIX)/hs/_asm/undocumented/$(MODULE)/ ; rm -v -fr $(SOFILE:.so=.so.dSYM) ; popd)
 	rmdir -p $(PREFIX)/hs/_asm/undocumented/$(MODULE) ; exit 0
 
-.PHONY: all clean uninstall verify docs install install-objc install-lua install-docs
+.PHONY: all clean uninstall verify install install-objc install-lua

Diff for: internal.m

@@ -1,13 +1,11 @@
-#import <Cocoa/Cocoa.h>
-// #import <Carbon/Carbon.h>
-#import <LuaSkin/LuaSkin.h>
-// #import "spaces.h"
+@import Cocoa ;
+@import LuaSkin ;
 #import "CGSSpace.h"
 
 extern CGSConnectionID _CGSDefaultConnection(void);
 #define CGSDefaultConnection _CGSDefaultConnection()
 
-int refTable ;
+static int refTable ;
 
 #pragma mark - Support Functions
 
@@ -202,7 +200,7 @@ static int activeSpace(lua_State* L) {
 
 static int querySpaces(lua_State *L) {
     [[LuaSkin shared] checkArgs:LS_TNUMBER, LS_TBREAK] ;
-    CFArrayRef CGspaces = CGSCopySpaces(CGSDefaultConnection, (CGSSpaceMask)lua_tointeger(L, 1));
+    CFArrayRef CGspaces = CGSCopySpaces(CGSDefaultConnection, (CGSSpaceMask)(lua_tointeger(L, 1)));
     [[LuaSkin shared] pushNSObject:(__bridge_transfer NSArray *)CGspaces] ;
     return 1 ;
 }
@@ -422,7 +420,7 @@ static int spaceManagedShape(lua_State *L) {
     {NULL, NULL},
 };
 
-int luaopen_hs__asm_undocumented_spaces_internal(__unused lua_State* L) {
+int luaopen_hs__asm_undocumented_spaces_internal(lua_State* L) {
     refTable = [[LuaSkin shared] registerLibrary:moduleLib metaFunctions:nil] ;
 
     spacesMasksTable(L) ; lua_setfield(L, -2, "masks") ;