Skip to content

Commit d6f49c2

Browse files
committed
Minimize mkconcore diff for docker subdir build path fix
1 parent 0ace53a commit d6f49c2

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

mkconcore.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -792,27 +792,27 @@ def cleanup_script_files():
792792
dockerbuilddir = "docker-"+dockername.replace("/", "__").replace("\\", "__")
793793
fbuild.write("mkdir "+dockerbuilddir+"\n")
794794
fbuild.write("cd "+dockerbuilddir+"\n")
795-
fbuild.write("cp ../src/Dockerfile."+dockername+" Dockerfile\n")
796-
#copy sourcefiles from ./src into corresponding directories
797-
fbuild.write("cp ../src/"+sourcecode+" .\n")
798-
if langext == "py": #4/29/21
799-
fbuild.write("cp ../src/concore.py .\n")
800-
elif langext == "cpp": #6/22/21
801-
fbuild.write("cp ../src/concore.hpp .\n")
802-
elif langext == "v": #6/25/21
803-
fbuild.write("cp ../src/concore.v .\n")
804-
if langext == "m":
805-
fbuild.write("cp ../src/concore_*.m .\n")
806-
fbuild.write("cp ../src/import_concore.m .\n")
807-
if langext == "sh": #5/27/21
808-
fbuild.write("chmod u+x "+sourcecode+"\n")
809-
fbuild.write("cp ../src/"+dockername+".iport concore.iport\n")
810-
fbuild.write("cp ../src/"+dockername+".oport concore.oport\n")
811-
#include data files in here if they exist
812-
if os.path.isdir(sourcedir+"/"+dockername+".dir"):
813-
fbuild.write("cp -r ../src/"+dockername+".dir/* .\n")
814-
fbuild.write(DOCKEREXE+" build -t docker-"+dockername+" .\n")
815-
fbuild.write("cd ..\n")
795+
fbuild.write("cp ../src/Dockerfile."+dockername+" Dockerfile\n")
796+
#copy sourcefiles from ./src into corresponding directories
797+
fbuild.write("cp ../src/"+sourcecode+" .\n")
798+
if langext == "py": #4/29/21
799+
fbuild.write("cp ../src/concore.py .\n")
800+
elif langext == "cpp": #6/22/21
801+
fbuild.write("cp ../src/concore.hpp .\n")
802+
elif langext == "v": #6/25/21
803+
fbuild.write("cp ../src/concore.v .\n")
804+
if langext == "m":
805+
fbuild.write("cp ../src/concore_*.m .\n")
806+
fbuild.write("cp ../src/import_concore.m .\n")
807+
if langext == "sh": #5/27/21
808+
fbuild.write("chmod u+x "+sourcecode+"\n")
809+
fbuild.write("cp ../src/"+dockername+".iport concore.iport\n")
810+
fbuild.write("cp ../src/"+dockername+".oport concore.oport\n")
811+
#include data files in here if they exist
812+
if os.path.isdir(sourcedir+"/"+dockername+".dir"):
813+
fbuild.write("cp -r ../src/"+dockername+".dir/* .\n")
814+
fbuild.write(DOCKEREXE+" build -t docker-"+dockername+" .\n")
815+
fbuild.write("cd ..\n")
816816

817817
fbuild.close()
818818

0 commit comments

Comments
 (0)