Skip to content

Commit

Permalink
Removing mgen-visualdesigner from main mgen repo. It is now in the mg…
Browse files Browse the repository at this point in the history
…en-visualdesigner repo
  • Loading branch information
Johan Kjölhede committed Dec 20, 2014
1 parent 413bfe4 commit 2257818
Show file tree
Hide file tree
Showing 149 changed files with 3 additions and 11,899 deletions.
2 changes: 0 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,3 @@ lazy val mgen_javagenerator = (project in file("mgen-javagenerator")).dependsOn(
lazy val mgen_cppgenerator = (project in file("mgen-cppgenerator")).dependsOn(mgen_compiler)

lazy val mgen_javascriptgenerator = (project in file("mgen-javascriptgenerator")).dependsOn(mgen_compiler)

lazy val mgen_visualdesigner = (project in file("mgen-visualdesigner")).dependsOn(mgen_compiler, mgen_javalib)
29 changes: 3 additions & 26 deletions buildimpl.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ def clean():

def build():
createVersionFiles()
fastbuild_step1()
fastbuild_generate_code()
fastbuild_step2()
build_jvm_parts()


def test():
Expand Down Expand Up @@ -103,10 +101,9 @@ def createVersionFiles():
createJavaVersionFile2("javagenerator", mgen_version)
createJavaVersionFile2("javalib", mgen_version)
createJavaVersionFile2("javascriptgenerator", mgen_version)
createJavaVersionFile2("visualdesigner", mgen_version)


def fastbuild_step1():
def build_jvm_parts():
sbt(".", ('"project mgen_api" publish-local '
'"project mgen_idlparser" publish-local '
'"project mgen_idlgenerator" publish-local '
Expand All @@ -117,14 +114,6 @@ def fastbuild_step1():
'"project mgen_javascriptgenerator" publish-local '))


def fastbuild_generate_code():
check_call(mgen_cmd + 'model/project.xml plugin_paths="../mgen-javagenerator/target"', cwd="mgen-visualdesigner", shell=True)


def fastbuild_step2():
sbt(".", '"project mgen_visualdesigner" assembly publish-local ')


def tests_generate_code(): # Ideally here we'd just generate once, not nLangs times.
for lang in ["java", "cpp", "javascript"]:
for model in ["project.xml", "transient_testmodel/project.xml", "defaultvalues_testmodel/project.xml", "defaultvaluesreq_testmodel/project.xml"]:
Expand Down Expand Up @@ -190,7 +179,6 @@ def copyJarFilesToZipDir():
copySubProjectJarFilesToZipDir("mgen-javascriptgenerator", mgen_version, False)
copySubProjectJarFilesToZipDir("mgen-cppgenerator", mgen_version, False)
copySubProjectJarFilesToZipDir("mgen-javalib", mgen_version, False)
copySubProjectJarFilesToZipDir("mgen-visualdesigner", mgen_version, True)


def getCppIncludeDir():
Expand All @@ -217,18 +205,11 @@ def create_install_zip():
copyFile("mgen-starters/mgen.sh", "target/install_zip/bin/mgen.sh")
copyFile("mgen-starters/mgen.ex_", "target/install_zip/bin/mgen.exe")

copyFile("mgen-starters/mgen-visualdesigner.sh", "target/install_zip/bin/mgen-visualdesigner")
copyFile("mgen-starters/mgen-visualdesigner.sh", "target/install_zip/bin/mgen-visualdesigner.sh")
copyFile("mgen-starters/mgen-visualdesigner.ex_", "target/install_zip/bin/mgen-visualdesigner.exe")

copyFile("LICENSE", "target/install_zip/LICENSE.TXT")

mkFileExecutable("target/install_zip/bin/mgen")
mkFileExecutable("target/install_zip/bin/mgen.sh")

mkFileExecutable("target/install_zip/bin/mgen-visualdesigner")
mkFileExecutable("target/install_zip/bin/mgen-visualdesigner.sh")

versionFile = open("target/install_zip/BUILD.TXT", "w")
versionFile.write("Release version: " + mgen_version + "\n")
versionFile.write("Git commit date: " + getCommitDateString() + "\n")
Expand Down Expand Up @@ -266,9 +247,6 @@ def install():
mkFileExecutable(installPath + "/bin/mgen")
mkFileExecutable(installPath + "/bin/mgen.sh")

mkFileExecutable(installPath + "/bin/mgen-visualdesigner")
mkFileExecutable(installPath + "/bin/mgen-visualdesigner.sh")

def upload_to_culvertsoft():
folderName = mgen_version.lower()

Expand All @@ -291,8 +269,7 @@ def publish_to_sonatype():
'"project mgen_compiler" publish-signed '
'"project mgen_javagenerator" publish-signed '
'"project mgen_cppgenerator" publish-signed '
'"project mgen_javascriptgenerator" publish-signed '
'"project mgen_visualdesigner" publish-signed '))
'"project mgen_javascriptgenerator" publish-signed '))


def publish_impl():
Expand Down
2 changes: 0 additions & 2 deletions mgen-visualdesigner/.gitignore

This file was deleted.

4 changes: 0 additions & 4 deletions mgen-visualdesigner/assembly.sbt

This file was deleted.

69 changes: 0 additions & 69 deletions mgen-visualdesigner/build.sbt

This file was deleted.

12 changes: 0 additions & 12 deletions mgen-visualdesigner/model/project.xml

This file was deleted.

126 changes: 0 additions & 126 deletions mgen-visualdesigner/model/se.culvertsoft.mgen.visualdesigner.model.xml

This file was deleted.

4 changes: 0 additions & 4 deletions mgen-visualdesigner/project/plugins.sbt

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 2257818

Please sign in to comment.