Changeset 334

Timestamp:

03/05/05 02:22:26 (4 years ago)

Author:

kris

Message:

made mango.a the default build target

Files:

• trunk/darwin.make (modified) (6 diffs)
• trunk/linux.make (modified) (2 diffs)

trunk/darwin.make

@@ -37 +37 @@
-CLUSTERSOCKET = $(MANGO)/cluster/qos/socket/
-ICU =           $(MANGO)/icu/
-
-
-
+
-
-COMPILE =   $(DMD) -c $(DFLAGS) -od$(OBJ) $**
@@ -61 +59 @@
-        $(EXAMPLE)tserver.d\
-
+SRC_FORMAT = \
+        $(FORMAT)Int.d \
+        $(FORMAT)Long.d \
+        $(FORMAT)Double.d \
+        $(FORMAT)Number.d \
+        $(FORMAT)DGDouble.d \
+        $(FORMAT)DateTime.d \
+        $(FORMAT)Formatter.d \
-
-SRC_IO = \
@@ -95 +101 @@
-        $(IO)EndianWriter.d \
-        $(IO)Token.d \
-        $(IO)TokenEx.d \
-        $(IO)Tokenizer.d \
-        $(IO)TextWriter.d \
@@ -208 +213 @@
-SRC_ICU = \
-        $(ICU)ICU.d \
-   $(ICU)UChar.d
+        $(ICU)UChar.d 
-        $(ICU)ULocale.d \
-        $(ICU)UConverter.d \
@@ -230 +235 @@
-
-
-
-#   $(XML)java.d \
-#   $(XML)SaxDriver.d \
-#   $(XML)Stack.d \
-#   $(XML)XmlParser.d \
-#   $(SAXMODEL)IAttributeList.d \
-#   $(SAXMODEL)IAttributes2.d \
-#   $(SAXMODEL)IAttributes.d \
-#   $(SAXMODEL)IContentHandler.d \
-#   $(SAXMODEL)IDeclHandler.d \
-#   $(SAXMODEL)IDocumentHandler.d \
-#   $(SAXMODEL)IDTDHandler.d \
-#   $(SAXMODEL)IEntityResolver2.d \
-#   $(SAXMODEL)IEntityResolver.d \
-#   $(SAXMODEL)IErrorHandler.d \
-#   $(SAXMODEL)ILexicalHandler.d \
-#   $(SAXMODEL)ILocator2.d \
-#   $(SAXMODEL)ILocator.d \
-#   $(SAXMODEL)IParser.d \
-#   $(SAXMODEL)IXMLFilter.d \
-#   $(SAXMODEL)IXMLReader.d \
-#   $(SAX)AttributeListImpl.d \
-#   $(SAX)Attributes2Impl.d \
-#   $(SAX)AttributesImpl.d \
-#   $(SAX)DefaultHandler2.d \
-#   $(SAX)DefaultHandler.d \
-#   $(SAX)HandlerBase.d \
-#   $(SAX)InputSource.d \
-#   $(SAX)Locator2Impl.d \
-#   $(SAX)LocatorImpl.d \
-#   $(SAX)NamespaceSupport.d \
-#   $(SAX)ParserAdapter.d \
-#   $(SAX)ParserFactory.d \
-#   $(SAX)SaxException.d \
-#   $(SAX)XMLFilterImpl.d \
-#   $(SAX)XMLReaderAdapter.d \
-#   $(SAX)XMLReaderFactory.d \
-
-        
-unittest : libmango.a
-    $(DMD) -c $(DFLAGS) $(TEST)unittest.d 
-    $(CC) -o mangotest unittest.o libmango.a -lphobos -g
-    
-servlets : libmango.a
-    $(DMD) -c $(DFLAGS) $(EXAMPLE)servlets.d 
-    $(CC) -o servlets servlets.o libmango.a -lphobos -g
-    
-cclient : libmango.a
-    $(DMD) -c $(DFLAGS) $(EXAMPLE)cclient.d 
-    $(CC) -o cclient cclient.o libmango.a -lphobos -g
-    
-cserver : libmango.a
-    $(DMD) -c $(DFLAGS) $(EXAMPLE)cserver.d 
-    $(CC) -o cserver cserver.o libmango.a -lphobos -g
-    
-unittestbin :
-    $(DMD) -of./obj/mango $(OBJ)*.o
-    
-libmango.a :
-    mkdir -p $(OBJ)
@@ -293 +240 @@
-    ar -r $@ $(OBJ)*.o
-    ranlib $@
+
+unittest : libmango.a
+    $(DMD) -c $(DFLAGS) $(TEST)unittest.d 
+    $(CC) -o mangotest unittest.o libmango.a -lphobos -g
+    
+servlets : libmango.a
+    $(DMD) -c $(DFLAGS) $(EXAMPLE)servlets.d 
+    $(CC) -o servlets servlets.o libmango.a -lphobos -g
+    
+cclient : libmango.a
+    $(DMD) -c $(DFLAGS) $(EXAMPLE)cclient.d 
+    $(CC) -o cclient cclient.o libmango.a -lphobos -g
+    
+cserver : libmango.a
+    $(DMD) -c $(DFLAGS) $(EXAMPLE)cserver.d 
+    $(CC) -o cserver cserver.o libmango.a -lphobos -g
+    
+unittestbin :
+    $(DMD) -of./obj/mango $(OBJ)*.o
+    

trunk/linux.make

@@ -237 +237 @@
-
-        
+libmango.a :
+    $(DMD) -c $(DFLAGS) -od$(OBJ) $(SRC_IO) $(SRC_CACHE) $(SRC_HTTP) $(SRC_LOG) $(SRC_CLUSTER) $(SRC_ICU) $(SRC_SERVLET)
+    ar -r $@ $(OBJ)*.o
+
-unittest : libmango.a
-    $(DMD) -c $(DFLAGS) $(TEST)unittest.d 
@@ -256 +260 @@
-    $(DMD) -of./obj/mango $(OBJ)*.o
-    
-libmango.a :
-    $(DMD) -c $(DFLAGS) -od$(OBJ) $(SRC_IO) $(SRC_CACHE) $(SRC_HTTP) $(SRC_LOG) $(SRC_CLUSTER) $(SRC_ICU) $(SRC_SERVLET)
-    ar -r $@ $(OBJ)*.o