Changeset 3473

Timestamp:

03/01/10 07:22:28 (5 months ago)

Author:

trichards

Message:

Added fixup for Eclipse in zpkg.

Files:

• Setup/trunk/Package/zpkg.lua (modified) (1 diff)

Setup/trunk/Package/zpkg.lua

@@ -474 +474 @@
 end
 
+local function fixEclipseHandler()
+function generateBuildHandler(startArg)
+    -- First arg is build directory, second arg is source directory
+
+        local argsUsed = 2;
+    local buildDirectory = "";
+    local sourceDirectory = "";
+
+    -- Get buildDirectory from the first argument
+    if arg[startArg + 1] ~= nil then
+        buildDirectory =  arg[startArg + 1];
+    else
+        print("Usage: zpkg build fix <buildDir> <sourceDir>");
+        return argsUsed;
+    end
+    
+    -- Get sourceDirectory from the second argument
+    if arg[startArg + 2] ~= nil then
+        sourceDirectory =  arg[startArg + 2];
+    else
+        print("Usage: zpkg build fix <buildDir> <sourceDir>");
+        return argsUsed;
+    end
+
+        local inputProject = buildDirectory .. "/.project";
+    local inputCProject = buildDirectory .. "/.cproject";
+
+        local outputProject = sourceDirectory .. "/project";
+        local outputCProject = sourceDirectory .. "/cproject";
+        
+    -- Load the .project file
+        local template = loadTemplate(inputProject)
+
+        if (template == nil) then
+                print("Error finding " .. inputProject)
+                return argsUsed;
+        end
+        
+        local result = string.gsub(template, buildDirectory .. "</name>", sourceDirectory .. "</name>");
+
+        local file = io.open(outputProject, "w")
+        file:write(result)
+        file:close()
+
+    -- Load the .cproject file
+    template = loadTemplate(inputCProject);
+        if (template == nil) then
+                print("Error finding " .. inputCProject)
+                return argsUsed;
+        end
+
+    return argsUsed;
+end
 
 buildHandlers =
 {
         ["generate"] = { func = generateBuildHandler, help = "Generate configuration files" }
+    ["fix"] = { func = fixEclipseHandler, help = "Fix Eclipse build files to work with version control" } 
 }