From de2738259547546411d30770038fa2022c1bc341 Mon Sep 17 00:00:00 2001
From: lxsang <xsang.le@gmail.com>
Date: Thu, 19 Dec 2019 23:01:05 +0100
Subject: [PATCH] update makefiles

---
 Makefile          |   9 ++-
 apps/Makefile     |   7 +-
 blog/Makefile     |   5 +-
 get/Makefile      |   7 +-
 info/Makefile     |  10 +--
 info/index.ls.old | 196 ----------------------------------------------
 os/Makefile       |   8 +-
 7 files changed, 13 insertions(+), 229 deletions(-)
 delete mode 100644 info/index.ls.old

diff --git a/Makefile b/Makefile
index aaaa39c..eca50c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
-BUILDDIR = ./build
-projs = grs info blog apps os
+BUILDDIR?=./build
+PROJS?=grs info blog apps os
 copyfiles =  index.ls mimes.json
 main:  copy
-	for f in $(projs); do  make -C  "$${f}" ; done
+	for f in $(PROJS); do  BUILDDIR=$(BUILDDIR)/"$${f}" make -C  "$${f}" ; done
 
 copy:
 	cp -rf $(copyfiles) $(BUILDDIR)
 	cp -r silk $(BUILDDIR)
 
 clean:
-	-for f in $(projs); do rm -r $(BUILDDIR)/"$${f}"; done
+	-for f in $(PROJS); do rm -r $(BUILDDIR)/"$${f}"; done
+	-for f in $(copyfiles); do rm -r $(BUILDDIR)/"$${f}"; done
 	-rm -r $(BUILDDIR)/silk
\ No newline at end of file
diff --git a/apps/Makefile b/apps/Makefile
index 6aa4b87..5cd96dc 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,5 +1,3 @@
-BUILDDIR = ../build/apps
-
 copyfiles =  router.lua controllers logs views models 
 coffees = 	assets/coffee/bootstrap.coffee \
 			assets/coffee/BaseObject.coffee \
@@ -23,7 +21,4 @@ js:
 	- rm assets/scripts/main.*
 	for f in $(coffees); do (cat "$${f}"; echo) >> assets/scripts/main.coffee; done
 	coffee --compile assets/scripts/main.coffee
-	-rm assets/scripts/main.coffee
-
-clean:
-	rm -rf $(BUILDDIR)/*  
\ No newline at end of file
+	-rm assets/scripts/main.coffee 
\ No newline at end of file
diff --git a/blog/Makefile b/blog/Makefile
index 80063f9..8f11063 100644
--- a/blog/Makefile
+++ b/blog/Makefile
@@ -1,10 +1,7 @@
-BUILDDIR = ../build/blog
-
 copyfiles =  assets views models controllers router.lua
 
 main:
 	- mkdir $(BUILDDIR)
 	- cp -rf $(copyfiles) $(BUILDDIR)
 	- cd $(BUILDDIR) && ln -s ../grs ./rst
-clean:
-	rm -rf $(BUILDDIR)/*  
\ No newline at end of file
+	
\ No newline at end of file
diff --git a/get/Makefile b/get/Makefile
index 623ac9c..4e6eb2b 100644
--- a/get/Makefile
+++ b/get/Makefile
@@ -1,10 +1,5 @@
-BUILDDIR = ../build/get
-
 copyfiles =  router.lua shs  
 main:
 	- mkdir -p $(BUILDDIR)
 	cp -rf $(copyfiles) $(BUILDDIR)
-	- cd $(BUILDDIR) && ln -s ../grs ./rst
-
-clean:
-	rm -rf $(BUILDDIR)/*  
\ No newline at end of file
+	- cd $(BUILDDIR) && ln -s ../grs ./rst 
\ No newline at end of file
diff --git a/info/Makefile b/info/Makefile
index d527173..6c67172 100644
--- a/info/Makefile
+++ b/info/Makefile
@@ -1,10 +1,6 @@
-BUILDDIR = ../build/info
-
-copyfiles =  index.ls style.css router.lua models views controllers logs robot.txt
+copyfiles =  style.css router.lua models views controllers robot.txt
 
 main:
 	- mkdir $(BUILDDIR)
-	- cp -rf $(copyfiles) $(BUILDDIR)
-	- cd $(BUILDDIR) && ln -s ../grs ./rst
-clean:
-	rm -rf $(BUILDDIR)/*  
\ No newline at end of file
+	cp -rf $(copyfiles) $(BUILDDIR)
+	- cd $(BUILDDIR) && ln -s ../grs ./rst
\ No newline at end of file
diff --git a/info/index.ls.old b/info/index.ls.old
deleted file mode 100644
index 1f0083b..0000000
--- a/info/index.ls.old
+++ /dev/null
@@ -1,196 +0,0 @@
-<?lua
-    std.html()
-    local user = "mrsang"
-    local die = function(m)
-        echo(m)
-        debug.traceback=nil
-        error("Permission denied")
-    end
-    local sectionByCID = function(id)
-        local db = require("db.model").get(user,"cv_sections",nil)
-        if db == nil then die("Cannot get the cv_sections table") end
-        local cond = { exp = { ["="] = { cid = id } } , order = { start = "DESC" } }
-        local data, a = db:find(cond)
-        db:close()
-        return data, a
-    end
-    local db = require("db.model").get(user,"user",nil)
-    if db == nil then die("cannot get db data") end
-    local data, a = db:getAll()
-    db:close()
-    if data == nil or data[1] == nil then die("Cannot fetch user info") end
-    data = data[1]
-?>
-<html>
-    <head>
-        <!--script type="text/javascript" src="../os/scripts/jquery-3.2.1.min.js"></script-->
-        <script type="text/javascript" src="rst/gscripts/showdown.min.js"></script>
-        <!--link rel="stylesheet" type="text/css" href="grs/ubuntu-regular.css" /-->
-        <link rel="stylesheet" type="text/css" href="style.css" />
-        <link rel="stylesheet" type="text/css" href="rst/font-awesome.css" />
-        <title>Porfolio</title>
-    </head>
-    <body>
-    <div class="layout">
-        
-        <div class = "cv-content">
-            <h1>
-                <span class="name"><?=data.fullname?></span>
-                <span class="cv">Curriculum Vitae</span>
-            </h1>
-            <p class="coordination">
-                <span class="fa fa-home"></span><?=data.address?></p>
-            <p class="coordination">
-                <span class="fa fa-phone"></span>
-                <span class="text"><?=data.Phone?></span>
-                <span class="fa fa-envelope-o"></span>
-                <span class="text"><?=data.email?></span>
-                <span class="fa fa-globe"></span>
-                <span class="text"><a href ="<?=data.url?>"><?=data.url?></a></span>
-            </p>
-            <p class="shortbio">
-                <span class="fa fa-quote-left"></span>
-                <span><?=data.shortbiblio?></span>
-                <span class="fa fa-quote-right"></span>
-            </p>
-<?lua
-    -- query the the sections list
-    db = require("db.model").get(user,"cv_cat",nil)
-    if db == nil then die("Cannot get the cv_cat table") end
-    local cond = { exp = { ["="] = { pid = 0 } }, order = { name = "ASC" } }
-    data, a = db:find(cond)
-    if data then
-        for k, idx in pairs(a) do
-            local cat = data[idx]
-            cond = { exp = { ["="] = { pid = cat.id } }, order = { name = "ASC" } }
-            local children, b = db:find(cond)
-            if children and #children > 0 then -- we have the sub childrent  
-?>
-            <div class="container" id =<?='"toc'..idx..'"'?>>
-                <h1><?=cat.name:gsub("^%d+%.","")?></h1>
-            <?lua
-                for l, j in pairs(b) do
-                    local child = children[j]
-            ?>
-                <div class="sub-container">
-                    <h2><?=child.name:gsub("^%d+%.","")?></h2>
-                    <?lua
-                        local entries, c = sectionByCID(child.id)
-                        if entries then
-                            for m, k in pairs(c) do
-                                local entry = entries[k]
-                    ?>
-                    <div class= "entry">
-                        <p>
-                            <?lua if entry.title ~= "" then ?>
-                                <span class= "fa  fa-bookmark"></span>
-                                <span class= "title"><?=entry.title?></span>
-                            <?lua end ?>
-                            <span class= "title-optional"></span>
-                            <span class="location"><?=entry.location?></span>
-                        </p>
-                        <div class="entry-short-des">
-                            <span><?=entry.subtitle?></span>
-                            <span class="date">
-                            <?lua
-                                if entry["start"]:match("^20%d.*") and entry['end']:match("^20%d.*")  then
-                                    echo(entry.start.."-"..entry['end'])
-                                end
-                            ?>
-                            </span>
-                        </div>
-                        <div class="entry-description">
-                                <?=entry.content?>
-                        </div>
-                    </div>
-                    <?lua
-                            end
-                        end
-                    ?>
-                </div>
-            <?lua
-                end
-            ?>
-            </div>
-        <?lua
-            else
-        ?>
-            <div class="container" id =<?='"toc'..idx..'"'?>>
-                <h1><?=cat.name:gsub("^%d+%.","")?></h1>
-        <?lua
-                local entries, c = sectionByCID(cat.id)
-                if entries then
-                    for m, k in pairs(c) do
-                        local entry = entries[k]
-        ?>
-                    <div class= "entry">
-                        <p>
-                            <?lua if entry.title ~= "" then ?>
-                                <span class= "fa  fa-bookmark"></span>
-                                <span class= "title"><?=entry.title?></span>
-                            <?lua end ?>
-                            <span class= "title-optional"></span>
-                            <span class="location"><?=entry.location?></span>
-                        </p>
-                        <div class="entry-short-des">
-                            <span><?=entry.subtitle?></span>
-                            <span class="date">
-                            <?lua
-                                if entry["start"]:match("^20%d.*") and entry['end']:match("^20%d.*") then
-                                    echo(entry.start.."-"..entry['end'])
-                                end
-                            ?>
-                            </span>
-                        </div>
-                        <div class="entry-description">
-                                <?=entry.content?>
-                        </div>
-                    </div>
-            <?lua
-                    end
-                end
-            echo ("</div>")
-            end
-        end
-        db:close()
-    end
-        ?>
-            <div class = "container">
-                <h1 style="margin:0;"></h1>
-                <p style="text-align:right; padding:0; margin:0;color:#878887;">Powered by antd server, (C) 2017-2018 Xuan Sang LE</p>
-            </div>
-        </div>
-        <?lua
-        if (not HEADER.mobile) and (REQUEST.query.print ~= "true") then
-        ?>
-        <div class = "cv-toc">
-            <ul>
-            <?lua
-                if data then
-                    for k, idx in pairs(a) do
-                        local cat = data[idx]
-            ?>
-                <li><a href=<?='"#toc'..idx..'"'?>><?=cat.name:gsub("^%d+%.","")?></a></li>
-            <?lua
-                    end
-                end
-            ?>
-            </ul>
-        </div>
-        <?lua end ?>
-    </div>
-    <script>
-        window.onload = function()
-        {
-            var els = document.getElementsByClassName("entry-description");
-            var converter = new showdown.Converter();
-            for(var i in els)
-            {
-                var text  = els[i].innerHTML;
-                var html      = converter.makeHtml(text);
-                els[i].innerHTML = html;
-            }
-        }
-    </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/os/Makefile b/os/Makefile
index 53264b8..2c845ea 100644
--- a/os/Makefile
+++ b/os/Makefile
@@ -1,10 +1,6 @@
-BUILDDIR = ../build/os
-
 copyfiles =   views models controllers logs libs router.lua
 
 main:
 	- mkdir $(BUILDDIR)
-	- cp -rf $(copyfiles) $(BUILDDIR)
-	- cd $(BUILDDIR) && ln -s ../grs ./rst
-clean:
-	cd $(BUILDDIR) && rm -rf $(copyfiles)  
\ No newline at end of file
+	- cp -rfv $(copyfiles) $(BUILDDIR)
+	- cd $(BUILDDIR) && ln -s ../grs ./rst
\ No newline at end of file