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

(MAINT) Build pe-puppetdb from this repo. #1354

Merged
merged 1 commit into from Apr 21, 2015
Merged

(MAINT) Build pe-puppetdb from this repo. #1354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion project.clj
View file
Open in desktop
@@ -1,4 +1,5 @@
(def pdb-version "3.0.0-SNAPSHOT")
(def pe-pdb-version "0.1.0-SNAPSHOT")

(defn deploy-info
"Generate deployment information from the URL supplied and the username and
Expand Down Expand Up @@ -105,7 +106,7 @@
:build-type "foss"
:main-namespace "puppetlabs.puppetdb.main"
:create-varlib true}
:config-dir "ext/config"
:config-dir "ext/config/foss"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, was this breaking something before?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, ext/config actually wasn't even being used (that directory doesn't exist).

I mainly added foss subdirectory here to demonstrate a further means of differentiation between foss and pe if necessary. I don't see any problem with both the foss and the pe build pointing to the same directory, especially since they aren't being used--just let me know what your preference is and I will update the PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's :config-dir used for? If were not using it @waynr should it be an optional are to ezbake?

}

:deploy-repositories [["releases" ~(deploy-info "http://nexus.delivery.puppetlabs.net/content/repositories/releases/")]
Expand All @@ -129,6 +130,17 @@
:name "puppetdb"
:plugins [[puppetlabs/lein-ezbake "0.2.2"
:exclusions [org.clojure/clojure]]]}
:pe {:dependencies ^:replace [[puppetlabs/puppetdb ~pdb-version]
[org.clojure/tools.nrepl "0.2.3"]
[puppetlabs/pe-puppetdb-extensions ~pe-pdb-version]]
:lein-ezbake {:vars {:user "pe-puppetdb"
:group "pe-puppetdb"
:build-type "pe"
:main-namespace "puppetlabs.puppetdb.core"
:create-varlib true}
:config-dir "ext/config/pe"}
:version ~pe-pdb-version
:name "pe-puppetdb"}
:testutils {:source-paths ^:replace ["test"]}
:ci {:plugins [[lein-pprint "1.1.1"]]}}

Expand Down