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.

Sign up for GitHub

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

Jump to bottom

Small fixes #28

Merged
merged 3 commits into from
Apr 16, 2018
Merged

Small fixes #28

merged 3 commits into from
Apr 16, 2018

Conversation

adamretter
Copy link
Contributor

No description provided.

@adamretter adamretter added the bug label Mar 23, 2018
@adamretter adamretter requested a review from joewiz March 23, 2018 13:40
@adamretter
Copy link
Contributor Author

@joewiz @duncdrum Bing Bong! Any motion on this please?

@duncdrum
Copy link
Contributor

duncdrum commented Apr 2, 2018

@adamretter fix in PR seems self-explanatory. Mid-term I still think we should split modules into their own expath libraries.

@joewiz
Copy link
Member

joewiz commented Apr 2, 2018

@adamretter A clean clone of the master branch builds just fine for me, without the fixes in this PR. Can you elaborate on the error you get that this PR fixes?

$ git clone git://github.com/eXist-db/shared-resources.git
Cloning into 'shared-resources'...
remote: Counting objects: 514, done.
remote: Total 514 (delta 0), reused 0 (delta 0), pack-reused 514
Receiving objects: 100% (514/514), 619.49 KiB | 2.74 MiB/s, done.
Resolving deltas: 100% (223/223), done.

$ cd shared-resources/

$ git submodule update --init --recursive
Submodule 'support/ace' (git://github.com/ajaxorg/ace.git) registered for path 'support/ace'
Cloning into '/Users/joe/workspace/shared-resources/support/ace'...
Submodule path 'support/ace': checked out 'fdbd11d3dfa758761dfbc28b49d9eb8a1831f246'
Submodule 'build' (git://github.com/ajaxorg/ace-builds.git) registered for path 'support/ace/build'
Submodule 'doc/wiki' (git://github.com/ajaxorg/ace.wiki.git) registered for path 'support/ace/doc/wiki'
Cloning into '/Users/joe/workspace/shared-resources/support/ace/build'...
Cloning into '/Users/joe/workspace/shared-resources/support/ace/doc/wiki'...
Submodule path 'support/ace/build': checked out 'fc9d2cae9fe8e6e95e74c86a31d21caadd8f9f39'
Submodule path 'support/ace/doc/wiki': checked out 'd93670b47d776987b38bb2c31777c4e488338fac'

$ ant
Buildfile: /Users/joe/workspace/shared-resources/build.xml

prepare-ace:
      [get] Getting: https://nightwing.github.io/emmet-core/emmet.js
      [get] To: /Users/joe/workspace/shared-resources/resources/scripts/emmet.js

ace:
    [mkdir] Created dir: /Users/joe/workspace/shared-resources/resources/scripts/ace
     [copy] Copying 285 files to /Users/joe/workspace/shared-resources/resources/scripts/ace

xar:
    [mkdir] Created dir: /Users/joe/workspace/shared-resources/build
     [copy] Copying 1 file to /Users/joe/workspace/shared-resources
      [zip] Building zip: /Users/joe/workspace/shared-resources/build/shared-resources-0.4.2.xar

all:

BUILD SUCCESSFUL
Total time: 2 seconds

@adamretter
Copy link
Contributor Author

@joewiz Well...

  1. The import modules are just improvements in XQuery style.
  2. On a clean checkout I could not get it to build without having the build.xml create those directories.

@joewiz
Copy link
Member

joewiz commented Apr 13, 2018

@adamretter I'm sure you've moved on from this issue, but is there any chance you could paste in your terminal input showing the error? Since I'm not seeing any problem, it would be helpful to see the error output.

@adamretter
Copy link
Contributor Author

adamretter commented Apr 13, 2018 •
edited
Loading

@joewiz sure here it is:

$ ant
Buildfile: /private/tmp/shared-resources/build.xml

prepare-ace:
      [get] Getting: https://nightwing.github.io/emmet-core/emmet.js
      [get] To: /private/tmp/shared-resources/resources/scripts/emmet.js

ace:
    [mkdir] Created dir: /private/tmp/shared-resources/resources/scripts/ace

BUILD FAILED
/private/tmp/shared-resources/build.xml:22: /private/tmp/shared-resources/support/ace/build/src-min does not exist.

@joewiz
Delete emmet.js during “clean”
270bf27 
confirmed that ant clean performs all steps that git clean -xdf would have performed.
@joewiz joewiz merged commit c9aec9d into eXist-db:master Apr 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joewiz joewiz Awaiting requested review from joewiz

Assignees
No one assigned
Labels
bug question
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adamretter @duncdrum @joewiz