Auto apply the changes needed to port flexml to windows: there is no unistd.h there.

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 18e4b3f..a78d849 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -213,12 +213,16 @@ JMSG_JAVA_SRC = \
   java/simgrid/msg/ProcessNotFoundException.java     \
   \
   java/simgrid/msg/Process.java                      \
+  java/simgrid/msg/DTDResolver.java                  \
   java/simgrid/msg/ApplicationHandler.java           \
   java/simgrid/msg/Channel.java                      \
   java/simgrid/msg/Host.java                         \
   java/simgrid/msg/Msg.java                          \
   java/simgrid/msg/Task.java                         \
-  java/simgrid/msg/ParallelTask.java                 
+  java/simgrid/msg/ParallelTask.java                 \
+  \
+  java/simgrid/msg/Sem.java
+
 
 SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c
 
@@ -333,10 +337,10 @@ clean-local:
 jardir = $(prefix)/jar 
 jar_DATA =  simgrid.jar
 
-simgrid.jar: $(JMSG_JAVA_SRC)
+simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd
        [ -e .classes ] || mkdir .classes
-       $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
-       $(JAR) cvf simgrid.jar -C .classes .;
+       $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) 
+       $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd;
 else
 EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
 endif
@@ -365,7 +369,6 @@ TEST_UNITS= @builddir@/cunit_unit.c @builddir@/ex_unit.c         \
             @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \
            @builddir@/xbt_str_unit.c \
             @builddir@/config_unit.c 
-CLEANFILES=$(TEST_UNITS)
 
 BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
               ../include/xbt/graphxml.h xbt/graphxml.c \
@@ -380,6 +383,8 @@ TESTS_ENVIRONMENT=$(SG_TEST_EXENV)
 EXTRA_DIST+=$(testall_SOURCES)
 
 if MAINTAINER_MODE
+CLEANFILES=$(TEST_UNITS)
+
 @builddir@/cunit_unit.c: xbt/cunit.c
        @top_srcdir@/tools/sg_unit_extractor.pl $^
 @builddir@/ex_unit.c: xbt/ex.c
@@ -409,12 +414,17 @@ clean-units:
         done
 else
 
+if BOTBUILD_MODE
+$(TEST_UNITS) simgrid_units_main.c clean-units: 
+       @echo "WARNING: Test units not generated, but touched instead since this is a bot build."
+       touch $@
+else 
 $(TEST_UNITS) simgrid_units_main.c clean-units: 
        @echo "ERROR: Test units not generated."
-       @echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag"
+       @echo "ERROR: If you are using a SVN checkout, configure with the --enable-maintainer-mode flag"
        @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list."
        @exit 1
-
+endif
 endif
 
 ###
@@ -428,8 +438,10 @@ gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
        set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^
+       sed 's/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n#  ifndef __STRICT_ANSI__\n#    include <io.h>\n#    include <process.h>\n#  endif\n#else\n#  include <unistd.h>\n#endif/g' -i $@
 xbt/graphxml.c: xbt/graphxml.l
        set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^
+       sed 's/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n#  ifndef __STRICT_ANSI__\n#    include <io.h>\n#    include <process.h>\n#  endif\n#else\n#  include <unistd.h>\n#endif/g' -i $@
 
 if HAVE_FLEXML
 surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
@@ -439,7 +451,6 @@ $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
        sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
        sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
 
-
 xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
        set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^
 $(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd