[Unison-hackers] [unison-svn] r512 - in trunk/src: . fsmonitor/linux fsmonitor/windows

[vouillon at seas.upenn.edu]

Author: vouillon
Date: 2012-09-18 12:10:59 -0400 (Tue, 18 Sep 2012)
New Revision: 512

Modified:
   trunk/src/RECENTNEWS
   trunk/src/fsmonitor/linux/Makefile
   trunk/src/fsmonitor/windows/Makefile
   trunk/src/mkProjectInfo.ml
Log:
* A bytecode version of unison-fsmonitor is now produced by "make NATIVE=false"


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2012-09-17 14:09:03 UTC (rev 511)
+++ trunk/src/RECENTNEWS	2012-09-18 16:10:59 UTC (rev 512)
@@ -1,3 +1,8 @@
+CHANGES FROM VERSION 2.46.6
+
+* A bytecode version of unison-fsmonitor is now produced by "make NATIVE=false"
+
+-------------------------------
 CHANGES FROM VERSION 2.46.4
 
 * Windows/lwt: correctly deals with Sys.Break exceptions when sleeping

Modified: trunk/src/fsmonitor/linux/Makefile
===================================================================
--- trunk/src/fsmonitor/linux/Makefile	2012-09-17 14:09:03 UTC (rev 511)
+++ trunk/src/fsmonitor/linux/Makefile	2012-09-18 16:10:59 UTC (rev 512)
@@ -2,19 +2,27 @@
 FSMONITOR = $(NAME)-fsmonitor
 
 DIR=fsmonitor/linux
-FSMCAMLOBJS = \
-   lwt/lwt.cmx lwt/pqueue.cmx lwt/generic/lwt_unix_impl.cmx lwt/lwt_unix.cmx \
-   $(DIR)/inotify.cmx $(DIR)/lwt_inotify.cmx \
-   fsmonitor/watchercommon.cmx $(DIR)/watcher.cmx
+FSMOCAMLOBJS = \
+   lwt/lwt.cmo lwt/pqueue.cmo lwt/generic/lwt_unix_impl.cmo lwt/lwt_unix.cmo \
+   $(DIR)/inotify.cmo $(DIR)/lwt_inotify.cmo \
+   fsmonitor/watchercommon.cmo $(DIR)/watcher.cmo
 FSMCOBJS = \
   $(DIR)/inotify_stubs.o
-FSMCAMLLIBS=unix.cmxa
+FSMOCAMLLIBS=unix.cma
 
+ifeq ($(NATIVE), true)
+  FSMCAMLOBJS=$(subst .cmo,.cmx, $(FSMOCAMLOBJS))
+  FSMCAMLLIBS=$(subst .cma,.cmxa, $(FSMOCAMLLIBS))
+else
+  FSMCAMLOBJS=$(FSMOCAMLOBJS)
+  FSMCAMLLIBS=$(FSMOCAMLLIBS)
+endif
+
 buildexecutable:: $(FSMONITOR)$(EXEC_EXT)
 
 $(FSMONITOR)$(EXEC_EXT): $(FSMCAMLOBJS) $(FSMCOBJS)
 	@echo Linking $@
-	$(OCAMLOPT) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(FSMCAMLLIBS) $^ $(CLIBS)
+	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(FSMCAMLLIBS) $^ $(CLIBS)
 
 clean::
 	rm -f $(DIR)/*.cm[iox] $(DIR)/*.o $(DIR)/*~

Modified: trunk/src/fsmonitor/windows/Makefile
===================================================================
--- trunk/src/fsmonitor/windows/Makefile	2012-09-17 14:09:03 UTC (rev 511)
+++ trunk/src/fsmonitor/windows/Makefile	2012-09-18 16:10:59 UTC (rev 512)
@@ -2,22 +2,30 @@
 FSMONITOR = $(NAME)-fsmonitor
 
 DIR=fsmonitor/windows
-FSMCAMLOBJS = \
-   ubase/rx.cmx unicode_tables.cmx unicode.cmx \
-   system/system_generic.cmx system/system_win.cmx \
-   system/win/system_impl.cmx \
-   lwt/lwt.cmx lwt/pqueue.cmx lwt/win/lwt_unix_impl.cmx lwt/lwt_unix.cmx \
-   lwt/win/lwt_win.cmx \
-   $(DIR)/shortnames.cmx fsmonitor/watchercommon.cmx $(DIR)/watcher.cmx
+FSMOCAMLOBJS = \
+   ubase/rx.cmo unicode_tables.cmo unicode.cmo \
+   system/system_generic.cmo system/system_win.cmo \
+   system/win/system_impl.cmo \
+   lwt/lwt.cmo lwt/pqueue.cmo lwt/win/lwt_unix_impl.cmo lwt/lwt_unix.cmo \
+   lwt/win/lwt_win.cmo \
+   $(DIR)/shortnames.cmo fsmonitor/watchercommon.cmo $(DIR)/watcher.cmo
 FSMCOBJS = \
    system/system_win_stubs.o lwt/lwt_unix_stubs.o $(DIR)/shortnames_stubs.o
-FSMCAMLLIBS=bigarray.cmxa unix.cmxa
+FSMOCAMLLIBS=bigarray.cma unix.cma
 
+ifeq ($(NATIVE), true)
+  FSMCAMLOBJS=$(subst .cmo,.cmx, $(FSMOCAMLOBJS))
+  FSMCAMLLIBS=$(subst .cma,.cmxa, $(FSMOCAMLLIBS))
+else
+  FSMCAMLOBJS=$(FSMOCAMLOBJS)
+  FSMCAMLLIBS=$(FSMOCAMLLIBS)
+endif
+
 buildexecutable:: $(FSMONITOR)$(EXEC_EXT)
 
 $(FSMONITOR)$(EXEC_EXT): $(FSMCAMLOBJS) $(FSMCOBJS)
 	@echo Linking $@
-	$(OCAMLOPT) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(FSMCAMLLIBS) $^ $(CLIBS)
+	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(FSMCAMLLIBS) $^ $(CLIBS)
 
 clean::
 	rm -f $(DIR)/*.cm[iox] $(DIR)/*.o $(DIR)/*~

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2012-09-17 14:09:03 UTC (rev 511)
+++ trunk/src/mkProjectInfo.ml	2012-09-18 16:10:59 UTC (rev 512)
@@ -84,3 +84,4 @@
 
 
 
+