[hydra-commits] kpfleming: branch ice/slice-preserving-translators r592 - in /ice/branches/sl...

[SVN commits to the Hydra project]

Author: kpfleming
Date: Mon Apr 26 10:20:55 2010
New Revision: 592

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=592
Log:
make this happy on Windows

Modified:
    ice/branches/slice-preserving-translators/cpp/Makefile
    ice/branches/slice-preserving-translators/cpp/include/Slice/Parser.h
    ice/branches/slice-preserving-translators/cs/Makefile
    ice/branches/slice-preserving-translators/java/build.xml

Modified: ice/branches/slice-preserving-translators/cpp/Makefile
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/cpp/Makefile?view=diff&rev=592&r1=591&r2=592
==============================================================================
--- ice/branches/slice-preserving-translators/cpp/Makefile (original)
+++ ice/branches/slice-preserving-translators/cpp/Makefile Mon Apr 26 10:20:55 2010
@@ -11,7 +11,7 @@
 
 include $(top_srcdir)/config/Make.rules
 
-SUBDIRS		= config src include test demo
+SUBDIRS		= config src include test
 
 INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
 

Modified: ice/branches/slice-preserving-translators/cpp/include/Slice/Parser.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/cpp/include/Slice/Parser.h?view=diff&rev=592&r1=591&r2=592
==============================================================================
--- ice/branches/slice-preserving-translators/cpp/include/Slice/Parser.h (original)
+++ ice/branches/slice-preserving-translators/cpp/include/Slice/Parser.h Mon Apr 26 10:20:55 2010
@@ -178,8 +178,8 @@
 SLICE_API bool derivedToBaseCompare(const ExceptionPtr&, const ExceptionPtr&);
 #endif
 
-bool scanParentsMetaData(const ClassDefPtr&, const std::string&, std::string&);
-bool scanParentsMetaData(const ExceptionPtr&, const std::string&, std::string&);
+SLICE_API bool scanParentsMetaData(const ClassDefPtr&, const std::string&, std::string&);
+SLICE_API bool scanParentsMetaData(const ExceptionPtr&, const std::string&, std::string&);
 
 // ----------------------------------------------------------------------
 // ParserVisitor

Modified: ice/branches/slice-preserving-translators/cs/Makefile
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/cs/Makefile?view=diff&rev=592&r1=591&r2=592
==============================================================================
--- ice/branches/slice-preserving-translators/cs/Makefile (original)
+++ ice/branches/slice-preserving-translators/cs/Makefile Mon Apr 26 10:20:55 2010
@@ -11,7 +11,7 @@
 
 include $(top_srcdir)/config/Make.rules.cs
 
-SUBDIRS		= src test demo
+SUBDIRS		= src test
 
 install:: install-common
 	@if test ! -d $(install_bindir) ; \

Modified: ice/branches/slice-preserving-translators/java/build.xml
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/java/build.xml?view=diff&rev=592&r1=591&r2=592
==============================================================================
--- ice/branches/slice-preserving-translators/java/build.xml (original)
+++ ice/branches/slice-preserving-translators/java/build.xml Mon Apr 26 10:20:55 2010
@@ -602,12 +602,11 @@
 
     <target name="dist-jar" depends="ice-jar, freeze-jar, icegridadmin-plain-jar, icegridadmin-pro-jar"/>
 
-    <target name="jar" depends="dist-jar, test-jar"/>
+    <target name="jar" depends="dist-jar"/>
 
     <target name="test" depends="test-compile, ice-compile"/>
 
     <target name="all" depends="jar">
-      <ant inheritAll="false" dir="test"/>
       <ant inheritAll="false" dir="demo"/>
     </target>