Changeset 656 for trunk/src

Timestamp:

Apr 3, 2007, 12:17:59 PM (17 years ago)

Author:

dkearney

Message:

added progress function for c, c++ and fortran, so people dont have to generate the cryptic progress string themselves to get a progress bar in the gui.

Location:

trunk/src

Files:

• Makefile.in (modified) (5 diffs)
• cee/RpUtilsCInterface.cc (added)
• cee/RpUtilsCInterface.h (added)
• core/RpUtils.cc (added)
• core/RpUtils.h (added)
• core/rappture.h (modified) (1 diff)
• fortran/RpLibraryFInterface.h (modified) (2 diffs)
• fortran/RpUtilsFInterface.cc (added)
• fortran/RpUtilsFInterface.h (added)
• fortran/RpUtilsFStubs.c (added)
• fortran/RpUtilsFStubs.h (added)

trunk/src/Makefile.in

@@ -68 +68 @@
 
 RP_IO_DEPS      = RpLibrary.o RpLibraryCInterface.o RpLibraryFInterface.o \
-                  scew_extras.o RpEntityRef.o
+                  scew_extras.o RpEntityRef.o RpUtils.o
 RP_UNITS_DEPS   = RpUnitsStd.o RpUnits.o RpUnitsCInterface.o RpUnitsFInterface.o
+RP_UTILS_DEPS   = RpUtils.o RpUtilsCInterface.o RpUtilsFInterface.o
 RP_OTHER_DEPS   = RpFortranCommon.o RpBindingsDict.o \
                   RpBufferCInterface.o RpOutcomeCInterface.o
@@ -85 +86 @@
 #### librappture shared object ###########################################
 
-librappture: $(RP_IO_DEPS) $(RP_UNITS_DEPS) $(RP_OTHER_DEPS)
+librappture: $(RP_IO_DEPS) $(RP_UTILS_DEPS) $(RP_UNITS_DEPS) $(RP_OTHER_DEPS)
         (cd ../src2/core/; make Outcome.o Ptr.o RpBuffer.o)
         if test "`uname`" == "Darwin"; then \
@@ -155 +156 @@
         $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_CORE2) -o $@ -c $?
 
+RpUtils.o: $(CORE_SRC)/RpUtils.cc
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
+
 RpVariable.o: $(CORE_SRC)/RpVariable.cc
         $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
@@ -196 +200 @@
 
 # include cee binding definitions
+
+RpUtilsCInterface.o: $(CEE_SRC)/RpUtilsCInterface.cc
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_CEE) -o $@ -c $?
 
 RpUnitsCInterface.o: $(CEE_SRC)/RpUnitsCInterface.cc
@@ -212 +219 @@
 
 # include fortran binding definitions
+
+RpUtilsFInterface.o: $(FORT_SRC)/RpUtilsFInterface.cc
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_FORTRAN) -o $@ -c $?
 
 RpUnitsFInterface.o: $(FORT_SRC)/RpUnitsFInterface.cc

trunk/src/core/rappture.h

@@ -17 +17 @@
 #include "RpUnitsFInterface.h"
 
+// include utility functions
+#include "RpUtils.h"
+#include "RpUtilsCInterface.h"
+#include "RpUtilsFInterface.h"
+
 // include base objects
 /*

trunk/src/fortran/RpLibraryFInterface.h

@@ -12 +12 @@
  */
 
-#ifndef _RpLIBRARY_F_H
-#define _RpLIBRARY_F_H
+#ifndef _RAPPTURE_LIBRARY_F_H
+#define _RAPPTURE_LIBRARY_F_H
 
 #ifdef __cplusplus
@@ -175 +175 @@
 #endif // ifdef __cplusplus
 
-#endif // ifndef _RpLIBRARY_F_H
+#endif // ifndef _RAPPTURE_LIBRARY_F_H