Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build output in .zip and .tar.gz does not match previous layout #163

Open
cpurdy opened this issue Feb 26, 2024 · 4 comments
Open

Build output in .zip and .tar.gz does not match previous layout #163

cpurdy opened this issue Feb 26, 2024 · 4 comments

Comments

@cpurdy
Copy link
Collaborator

cpurdy commented Feb 26, 2024

Describe the bug

Current install layout (the child "xdk" directory should have been one level up with the other "xdk" directory):

xvm$ tree ./xdk/build/install/    
./xdk/build/install/
└── xdk
    ├── VERSION
    ├── bin
    │   ├── linux_launcher
    │   ├── macos_launcher
    │   └── windows_launcher.exe
    ├── javatools
    │   ├── javatools.jar
    │   ├── javatools_bridge.xtc
    │   └── javatools_turtle.xtc
    ├── lib
    │   ├── aggregate.xtc
    │   ├── collections.xtc
    │   ├── crypto.xtc
    │   ├── ecstasy.xtc
    │   ├── json.xtc
    │   ├── jsondb.xtc
    │   ├── net.xtc
    │   ├── oodb.xtc
    │   ├── web.xtc
    │   ├── webauth.xtc
    │   └── xenia.xtc
    └── xdk
        ├── README.md
        ├── bin
        │   ├── README.md
        │   ├── cfg_macos.sh
        │   └── cfg_windows.cmd
        ├── doc
        │   └── README.md
        ├── examples
        │   ├── FizzBuzz.x
        │   ├── HelloClient.x
        │   ├── HelloServer.x
        │   ├── HelloWorld.x
        │   ├── README.md
        │   └── https.p12
        ├── javatools
        │   └── README.md
        └── lib
            └── README.md

Current .tar.gz layout (needs same fix as above, plus no xdk-0.4.43 up front):

xvm$ tar -tf xdk/build/distributions/xdk-0.4.43.tar.gz 
xdk-0.4.43/
xdk-0.4.43/VERSION
xdk-0.4.43/xdk/
xdk-0.4.43/xdk/bin/
xdk-0.4.43/xdk/bin/README.md
xdk-0.4.43/xdk/bin/cfg_macos.sh
xdk-0.4.43/xdk/bin/cfg_windows.cmd
xdk-0.4.43/xdk/README.md
xdk-0.4.43/xdk/examples/
xdk-0.4.43/xdk/examples/HelloClient.x
xdk-0.4.43/xdk/examples/FizzBuzz.x
xdk-0.4.43/xdk/examples/README.md
xdk-0.4.43/xdk/examples/HelloServer.x
xdk-0.4.43/xdk/examples/https.p12
xdk-0.4.43/xdk/examples/HelloWorld.x
xdk-0.4.43/xdk/lib/
xdk-0.4.43/xdk/lib/README.md
xdk-0.4.43/xdk/doc/
xdk-0.4.43/xdk/doc/README.md
xdk-0.4.43/xdk/javatools/
xdk-0.4.43/xdk/javatools/README.md
xdk-0.4.43/bin/
xdk-0.4.43/bin/linux_launcher
xdk-0.4.43/bin/macos_launcher
xdk-0.4.43/bin/windows_launcher.exe
xdk-0.4.43/lib/
xdk-0.4.43/lib/ecstasy.xtc
xdk-0.4.43/lib/aggregate.xtc
xdk-0.4.43/lib/collections.xtc
xdk-0.4.43/lib/crypto.xtc
xdk-0.4.43/lib/json.xtc
xdk-0.4.43/lib/jsondb.xtc
xdk-0.4.43/lib/net.xtc
xdk-0.4.43/lib/oodb.xtc
xdk-0.4.43/lib/web.xtc
xdk-0.4.43/lib/webauth.xtc
xdk-0.4.43/lib/xenia.xtc
xdk-0.4.43/javatools/
xdk-0.4.43/javatools/javatools_turtle.xtc
xdk-0.4.43/javatools/javatools_bridge.xtc
xdk-0.4.43/javatools/javatools.jar

A clear and concise description of what the bug is.

To Reproduce

Run the build. Examine the layout result of "installDist" build command. Examine the .tar.gz and .zip file layout.

Expected behavior

Designed layout:

xvm$ tar -tf ~/Downloads/xdk-0.4.3ci934+395b4ee482f9a76cec4bc5849ec6a997ae1ae980.tar.gz 
xdk/
xdk/examples/
xdk/examples/FizzBuzz.x
xdk/examples/HelloServer.x
xdk/examples/README.md
xdk/examples/https.p12
xdk/examples/HelloClient.x
xdk/examples/HelloWorld.x
xdk/README.md
xdk/doc/
xdk/doc/README.md
xdk/javatools/
xdk/javatools/README.md
xdk/javatools/javatools_turtle.xtc
xdk/javatools/javatools.jar
xdk/javatools/javatools_bridge.xtc
xdk/bin/
xdk/bin/linux_launcher
xdk/bin/README.md
xdk/bin/macos_launcher
xdk/bin/cfg_macos.sh
xdk/bin/windows_launcher.exe
xdk/bin/cfg_windows.cmd
xdk/lib/
xdk/lib/webauth.xtc
xdk/lib/xenia.xtc
xdk/lib/README.md
xdk/lib/web.xtc
xdk/lib/net.xtc
xdk/lib/collections.xtc
xdk/lib/aggregate.xtc
xdk/lib/jsondb.xtc
xdk/lib/crypto.xtc
xdk/lib/json.xtc
xdk/lib/ecstasy.xtc
xdk/lib/oodb.xtc

Additional context
This change occurred as part of the new build project.

@lagergren
Copy link
Contributor

This should be relatively easy to fix. It involves modifying the distribution contents, mostly. I think that #162 may make it easier for you to work from a function based distribution contents template.

@cpurdy
Copy link
Collaborator Author

cpurdy commented Feb 26, 2024

Gene and I fixed the xdk/xdk issue. I haven't pushed yet.

@cpurdy
Copy link
Collaborator Author

cpurdy commented Feb 26, 2024

Now the problem is getting rid of the "xdk-0.4.43/"
(and replacing it with just "xdk")

@cpurdy
Copy link
Collaborator Author

cpurdy commented Feb 26, 2024

That comes from the xdk/build.gradle.kts code:

    publications {
        val xdkArchive by registering(MavenPublication::class) {
            with(project) {
                groupId = group.toString()
                artifactId = project.name
                version = "" // version.toString()
            }

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants