Changeset 233

Timestamp:

03/01/07 22:58:42 (2 years ago)

Author:

aldacron

Message:

[Core]
* changed the build script once again into a monolithic script. This changed eliminated the build and buildopts directories. The -J switch is no longer needed to run buildme.d.
[Docs]
* the introduction to gl.html was way outdated and did not reflect Derelict's support for versions beyond 1.1, contradicting a later section in the page.
* GLVersion.Version21 was missing from the GLVersion enum listing.
* added a notice to build.html that parts of the build instructions are out of date and that an update will come eventually.

Files:

• trunk/build (deleted)
• trunk/buildme.d (modified) (5 diffs)
• trunk/buildopts (deleted)
• trunk/docs/build.html (modified) (2 diffs)
• trunk/docs/gl.html (modified) (6 diffs)

trunk/buildme.d

@@ -4 +4 @@
-version(Tango)
-{   
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -56 +76 @@
-}
-
-/Build
+
-private bool doNotDeleteBRF = false;
-
-//==============================================================================
-// Utility Functions
-//==============================================================================
-version(Tango)
-{
-    mixin(import("build/tangoUtil.d"));
-    
-    static assert(0, "The build script currently cannot be run under Tango.");
-}
-else
-{
-    mixin(import("build/phobosUtil.d"));
-}
-
-//==============================================================================
-// Builder Configuration
-//==============================================================================
-mixin(import("build/config.d"));
-
-//==============================================================================
@@ -99 +100 @@
-        switch(lower)
-        {
+            case "bud":
+                theBuilder = new BudBuilder();
+                break;
-            case "debug":
-                mode = Mode.Debug;
@@ -192 +196 @@
-
-//==============================================================================
+// BudBuilder -- for building with the Bud tool
+//==============================================================================
+class BudBuilder : Builder
+{
+    static this()
+    {
+        theBuilder = new BudBuilder();
+    }
+    
+    //==========================================================================
+    // Methods
+    //==========================================================================
+    override void buildPackage(char[] packageName)
+    {
+        // construct a path to the package's forbud file
+        char[] path = packageName ~ pathSep ~ _forBudName;
+        
+        // create the temporary brf
+        printf("Preparing to build package %s in %s mode...\n", toCString(packageName), toCString(modeToString()));
+        if(!createBRF(packageName, path))
+            return false;
+        
+        // call out to build with the name of the temp brf as an arg
+        if(execute(_name ~ " @" ~ _tempBRFName) != 0)
+        {
+            throw new Exception("Failed to build package " ~ packageName);
+        }
+        
+        if(!doNotDeleteBRF)
+        {
+            // delete the temporary brf
+            printf("Deleting temporary Build Response File...\n\n");
+            execute(delCmd ~ _tempBRFName);
+        }
+    }
+    
+private:
+    this()
+    {
+        _name               = "bud";            
+        _tempBRFName        = "temp.brf";
+        _forBudName         = "forbud.txt";
+        _brfBuf             = "";
+        
+        buildBRFBuffer();
+    }
+    
+    void buildBRFBuffer()
+    {
+        _brfBuf = loadOpts(_name, OptsType.Common) ~ "\n";          
+        _brfBuf ~= loadOpts(_name, cast(OptsType)mode);
+    }
+    
+    bool createBRF(char[] packageName, char[] path)
+    {
+        printf("Reading build tool arguments...\n");
+        
+        char[] txt;         // holds the contents of the forbud file
+        
+        // read the forbud.txt in this package      
+        txt = readFile(path);
+        
+        // make sure the file was found
+        if(txt is null)
+        {
+            printf("Could not find %s\n", toCString(path));
+            return false;
+        }
+        
+        // this will store all of the text to be output to the temp brf
+        char[] brf = "";
+            
+        // append the common brf buffer
+        brf ~= _brfBuf;
+        
+        // the package directory myst be on the import path
+        brf ~= "\n-I" ~ packageName;
+        
+        // if the current package is not DerelictUtil, then DerelictUtil must
+        // be on the import path and excluded from compilation
+        if(cmpStr(packageName, "DerelictUtil") != 0)
+        {
+            brf ~= "\n-IDerelictUtil\n-XDerelictUtil" ~ pathSep ~ "derelict" ~ pathSep ~ "util";
+        }   
+        
+        // append a switch to set the output path of the library and append the config file
+        brf ~= "\n-Tlib" ~ pathSep ~ libPre ~ packageName ~ libExt ~ "\n" ~ txt;
+        
+        // write the temporary brf to disk
+        printf("Creating temporary Build Response File...\n");
+        
+        writeFile(_tempBRFName, brf);
+        
+        return true;
+    }
+    
+    //==========================================================================
+    // Members
+    //==========================================================================
+    char[] _name;
+    char[] _tempBRFName;
+    char[] _forBudName;
+    char[] _brfBuf;
+}
+
+//==============================================================================
-// Utility functions
-//==============================================================================
@@ -223 +333 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/docs/build.html

@@ -30 +30 @@
-
-<h4>Which Compiler?</h4>
+<p><div class="important">
+This section is currently incorrect. For the time being, the build script requires
+you to have the <a href="#bud">Bud utility</a> installed. No other build tools or
+compilers are supported. The instructions to execute the script are valid, you just
+have only one option. This will change eventually and this section will be updated
+at that time.
+</div></p>
+
+<p>
-The script supports compiling directly
-with DMD and GDC (gdmd), or indirectly with <a href="#bud">Derek Parnell's Bud</a>. Executing the script 
@@ -51 +60 @@
-This should work whether you execute the script with dmd or gdmd. Bud will
-use the compiler for which it is configured.
+</p>
-
-<h4>Debug or Release?</h4>

trunk/docs/gl.html

@@ -12 +12 @@
-<h3>Introduction</h3>
-DerelictGL is a D binding to the <a href="http://www.opengl.org/">OpenGL</a>
-
-
-
-
-
-
+
+
+
-
-<h3>Using</h3>
@@ -26 +23 @@
-module.</li>
-<li>Before calling any OpenGL functions, you need to make a call to <tt>DerelictGL.load()</tt>.
-
+ and all core OpenGL 1.0 and 1.1 functions
-</ol>
-
@@ -67 +64 @@
-an OpenGL application for general public consumption, there is no way to guarantee
-which version of the API will be available on any user's system until the
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-graphics card driver, but there is no way to know which implementation the
-at
+ich
-until the context is created.
-
-
+
-Derelict's dynamic loading mechanism helps to work around the first issue. If not
-for the Windows problem, loading OpenGL version 1.2 and later could be accomplished
@@ -82 +83 @@
-order to maintain a consistent interface across all platforms, DerelictGL includes
-some additional methods and constants to load and manage different OpenGL versions.
-
-
+
-<tt>GLVersion</tt><br />
-This enum defines all OpenGL versions currently loadable by Derelict. At the
@@ -96 +96 @@
-<li>GLVersion.Version15</li>
-<li>GLVersion.Version20</li>
+<li>GLVersion.Version21</li>
-</ul>
-
@@ -110 +111 @@
-if a check has been made internally for the latest available version supported
-by the driver. If not, that check is made. Only then are the functions loaded.
-
-
+
-When this function returns successfully, a call to 
-<span class="bold">DerelictGL.availableVersion</span> will return either a value