move globPattern into pandaexpress

panda/src/express/Sources.pp

@@ -24,7 +24,9 @@
     datagramIterator.I datagramIterator.h datagramSink.I datagramSink.h \
     dcast.T dcast.h \
     error_utils.h \
-    get_config_path.h hashGeneratorBase.I hashGeneratorBase.h \
+    get_config_path.h \
+    globPattern.I globPattern.h \
+    hashGeneratorBase.I hashGeneratorBase.h \
     hashVal.I hashVal.h indent.I indent.h \
     indirectLess.I indirectLess.h \
     littleEndian.h \
@@ -80,6 +82,7 @@
     datagramIterator.cxx \
     datagramSink.cxx dcast.cxx error_utils.cxx \
     get_config_path.cxx \
+    globPattern.cxx \
     hashGeneratorBase.cxx hashVal.cxx indent.cxx \
     memoryInfo.cxx memoryUsage.cxx memoryUsagePointerCounts.cxx \
     memoryUsagePointers.cxx multifile.cxx \
@@ -121,7 +124,9 @@
     datagramGenerator.I datagramGenerator.h \
     datagramIterator.I datagramIterator.h \
     datagramSink.I datagramSink.h dcast.T dcast.h \
-    error_utils.h get_config_path.h hashGeneratorBase.I \
+    error_utils.h get_config_path.h \
+    globPattern.I globPattern.h \
+    hashGeneratorBase.I \
     hashGeneratorBase.h hashVal.I hashVal.h \
     indent.I indent.h \
     indirectLess.I indirectLess.h \

panda/src/express/express_composite1.cxx

@@ -15,6 +15,7 @@
 #include "dcast.cxx"
 #include "error_utils.cxx"
 #include "get_config_path.cxx"
+#include "globPattern.cxx"
 #include "hashGeneratorBase.cxx"
 #include "hashVal.cxx"
 #include "indent.cxx"

panda/src/putil/globPattern.h → panda/src/express/globPattern.h

@@ -38,7 +38,7 @@
 //               example, to scan a directory for all files matching a
 //               particular pattern.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA GlobPattern {
+class EXPCL_PANDAEXPRESS GlobPattern {
 public:
   INLINE GlobPattern(const string &pattern = string());
   INLINE GlobPattern(const GlobPattern &copy);

panda/src/putil/Sources.pp

@@ -28,7 +28,6 @@
     factoryParams.h \
     firstOfPairCompare.I firstOfPairCompare.h \
     firstOfPairLess.I firstOfPairLess.h \
-    globPattern.I globPattern.h \
     globalPointerRegistry.I globalPointerRegistry.h \
     indirectCompareNames.I indirectCompareNames.h \
     indirectCompareTo.I indirectCompareTo.h \
@@ -63,7 +62,7 @@
     cycleDataWriter.cxx \
     datagramInputFile.cxx datagramOutputFile.cxx \
     factoryBase.cxx \
-    factoryParam.cxx factoryParams.cxx globPattern.cxx \
+    factoryParam.cxx factoryParams.cxx \
     globalPointerRegistry.cxx ioPtaDatagramFloat.cxx \
     ioPtaDatagramInt.cxx ioPtaDatagramShort.cxx \
     keyboardButton.cxx lineStream.cxx lineStreamBuf.cxx \
@@ -101,7 +100,6 @@
     factoryParams.I factoryParams.h \
     firstOfPairCompare.I firstOfPairCompare.h \
     firstOfPairLess.I firstOfPairLess.h \
-    globPattern.I globPattern.h \
     globalPointerRegistry.I globalPointerRegistry.h \
     indirectCompareNames.I indirectCompareNames.h indirectCompareTo.I \
     indirectCompareTo.h \

panda/src/putil/putil_composite1.cxx

@@ -16,7 +16,6 @@
 #include "factoryBase.cxx"
 #include "factoryParam.cxx"
 #include "factoryParams.cxx"
-#include "globPattern.cxx"
 #include "globalPointerRegistry.cxx"
 #include "ioPtaDatagramFloat.cxx"
 #include "ioPtaDatagramInt.cxx"