Changeset 1875 in ProjectBuilder

Timestamp:

Apr 27, 2014, 12:46:33 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Improve git support for repo creation hopefully
• Git build works correctly for pdfposter now

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (1 diff)
• pb/bin/pb (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -298 +298 @@
     } else {
         # Pure git
-        open(GIT,"LANGUAGE=C $vcscmd --git-dir=$dir/.git remote -v 2> /dev/null |") || return("");
+        # First we may deal with a separat git repo under $dir
+        if ( -d "$dir/.git" ) {
+            open(GIT,"LANGUAGE=C $vcscmd --git-dir=$dir/.git remote -v 2> /dev/null |") || return("");
+        } else {
+            # If not, the pbconf dir may be in the pbprojdir so sharing the .git dir
+            my $cwd = abs_path();
+            chdir($dir) || return("");;
+            open(GIT,"LANGUAGE=C $vcscmd remote -v 2> /dev/null |") || return("");
+            chdir($cwd) || return("");
+        }
         while (<GIT>) {
             next unless (/^origin\s+(\S+) \(push\)$/);

devel/pb/bin/pb

@@ -4142 +4142 @@
     if (! -f $db) {
         $precmd = "CREATE TABLE announces (id INTEGER PRIMARY KEY AUTOINCREMENT, date DATE, announce VARCHAR[65535])";
+        # we should add the $db to the VCS as well here
     }