Use *local* create_dmd_release/extras, not from fresh installer c…

…lone
dlang · May 26, 2024 · d84001d · d84001d
1 parent 3122ab8
commit d84001d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/create_dmd_release/build_all.d b/create_dmd_release/build_all.d
@@ -650,7 +650,7 @@ int main(string[] args)
             scp(toCopy, "default:");
             if (os != OS.linux && !skipDocs) scp(workDir~"/docs", "default:");
             // copy create_dmd_release.d and dependencies
-            scp("create_dmd_release.d common.d", "default:");
+            scp("create_dmd_release.d common.d extras", "default:");
             version (CodeSign) if (!isBranch)
                 scp(workDir~"/codesign codesign", "default:");
 

diff --git a/create_dmd_release/create_dmd_release.d b/create_dmd_release/create_dmd_release.d
@@ -275,8 +275,8 @@ void init(string branch)
     releaseLib32Dir = osDir ~ "/lib" ~ suffix32;
     releaseBin64Dir = osDir ~ "/bin" ~ suffix64;
     releaseLib64Dir = osDir ~ "/lib" ~ suffix64;
-    allExtrasDir = cloneDir ~ "/installer/create_dmd_release/extras/all";
-    osExtrasDir  = cloneDir ~ "/installer/create_dmd_release/extras/" ~ osDirName;
+    allExtrasDir = origDir ~ "/extras/all";
+    osExtrasDir  = origDir ~ "/extras/" ~ osDirName;
 }
 
 void cleanAll(string branch)