Refactored build tools to resemble a more standard Drupal install profile.

Author: mikl

.gitignore

@@ -1,7 +1,8 @@
 *.py[co]
-settings.py
 
 # Ignore the product of a make.
-build/ding
-build/previous
-build/latest
+/build
+/libraries
+/modules
+/themes
+

README.markdown

@@ -40,11 +40,17 @@ Go through the following steps:
 1. Get a version of the ding-deploy package by either
     *  Cloning the repository from GitHub
     *  Downloading a tagged version which corresponds to a Ding release and unpack it
-2. Open a console and navigate to the `ding-deploy/build` directory
-3. Run `python ding_build [options] [installation path]`. The options include
+2. Open a console and navigate to the `ding-deploy` directory
+3. Run `python ding_build.py [options] [installation path]`.
+
+   If you run `python ding_build.py` without additional parameters, a full
+   site will be built for you in the `ding-deploy/build/ding` folder.
+
+   The options include
     *  `-d`: **Debug**. Required if you want to track the build progress
     *  `-D`: **Developer copy**. Build developer copy, using authenticated Git repositories.
     *  `-m MODE`: **Build mode**. Use 'site' for full Drupal site, 'profile' for just the installation profile. Default is 'site'.
+
 4. Wait. The build process should take ~5 minutes.
 5. *Optional* - download a translation:
     1. Navigate to your installation path
@@ -64,8 +70,19 @@ Go through the following steps:
 Downloading a local installation
 --------------------------------
 
-If you want to get a local installation up and running quickly or do not have access to the developer tools mentioned above you can [download a build of Ding from GitHub](http://github.com/dingproject/ding-deploy/downloads). 
+If you want to get a local installation up and running quickly or do not have access to the developer tools mentioned above you can [download a build of Ding from GitHub](http://github.com/dingproject/ding-deploy/downloads).
 
 If you choose to download a release you can skip straight to step 6 in the walkthrough above.
 
-The list of downloads should contain builds of all our releases since 1.1.1.
+The list of downloads should contain builds of all our releases since 1.1.1.
+
+Simple developer site
+---------------------
+
+It is also possible to use this Git repository as a standard Drupal
+install profile without our special Python build script.
+
+If you want to take this approach, simply check out this folder in your
+`drupal/profiles` folder and run
+`drush make --no-core --contrib-destination=. ding.make` within it.
+

ding_build.py

@@ -104,16 +104,16 @@ def setup_profile(options, make_path):
 
     shutil.copy('ding.profile', path)
 
-def create_symlinks(options, make_path):
+def create_symlinks(options, folder_name):
     """
     Set up symlinks to latest and previous build.
     """
     if options.symlink_prefix:
-        latest = '%s-latest' % options.symlink_prefix
-        previous = '%s-previous' % options.symlink_prefix
+        latest = 'build/%s-latest' % options.symlink_prefix
+        previous = 'build/%s-previous' % options.symlink_prefix
     else:
-        latest = 'latest'
-        previous = 'previous'
+        latest = 'build/latest'
+        previous = 'build/previous'
 
     # Revome previous symlink, if it exists.
     if os.path.lexists(previous):
@@ -124,25 +124,28 @@ def create_symlinks(options, make_path):
         os.rename(latest, previous)
 
     # Set up a link from our completed build to the new one.
-    os.symlink(make_path, latest)
+    os.symlink(folder_name, latest)
+
 
 def main():
     """ Main function, run when the script is run stand-alone. """
     (options, args) = parse_args()
     configure_logging(options)
 
-    if args:
-        make_path = args[-1]
-    else:
-        make_path = 'ding'
+    try:
+        folder_name = args[-1]
+    except IndexError: 
+        folder_name = 'ding'
+
+    make_path = 'build/%s' % folder_name
 
     logging.info('Starting make for mode "%s" in folder "%s"' % (options.mode, make_path))
     success = start_make(make_command(options, make_path))
 
     if success:
         setup_profile(options, make_path)
         if options.create_symlinks:
-            create_symlinks(options, make_path)
+            create_symlinks(options, folder_name)
     else:
         logging.error('Build FAILED for mode "%s" in folder "%s"' % (options.mode, make_path))
 

fabfile.py

@@ -110,10 +110,10 @@ def deploy(project=None, commit=None):
     )
 
     make_path = time.strftime('ding-%Y%m%d%H%M')[:-1]
-    cwd = os.path.join(env.build_path, env.project, 'build')
-    abs_make_path = os.path.join(cwd, make_path)
+    profile_path = os.path.join(env.build_path, env.project)
+    abs_make_path = os.path.join(profile_path, 'build', make_path)
 
-    with cd(cwd):
+    with cd(profile_path):
         # Update git checkout.
         run('git fetch')
         run('git checkout %s' % commit)