@@ -92,44 +92,28 @@ object BootstrapUtility {
9292 }
9393
9494 /**
95- * Prepares the environemnt for deployment. Should be called after package and assembly task.
95+ * Prepares the environment for deployment. Should be called after package and assembly task.
9696 *
9797 * @param logger the sbt logger
9898 * @param scalaLibraryVersion the scala library major version
99- * @param dev whether sbt scripts and stuff for plugin developers should be included
10099 */
101- def prepareDeploymentTask (logger : ManagedLogger , scalaLibraryVersion : String , dev : Boolean ): Unit = {
102- // Assuming, before this: clean, bs, assembly bootstrapProject, package and if dev apiProject/packagedArtifacts
100+ def prepareDeploymentTask (logger : ManagedLogger , scalaLibraryVersion : String ): Unit = {
101+ // Assuming, before this: clean, bs, assembly bootstrapProject, package
103102 // Assuming: Hardcoded "bin/" and "deploy/" folders
104103 // Assuming: A folder called "deployment-files" with all additional files (license, bat, etc.)
105- // Assuming: A folder called "deployment-files-dev" with more additional files for plugin developers (only included if dev == true)
106104
107105 withTaskInfo(" PREPARE DEPLOYMENT"
108106
109107 logger info " Started deployment process."
110108
111- // First step: Preparing bin folder
112- logger info " Preparing 'bin/' folder."
113- createOrEmptyFolder(" bin/"
114-
115- // Second step: Preparing deploy folder, copying bin folder, bootstrap launcher, etc.
116- logger info " Preparing 'deploy/' folder."
117- createOrEmptyFolder(" deploy/"
118- createOrEmptyFolder(" deploy/bin/"
119-
120- // Third step: Copying chat overflow files
121- logger info " Copying chat overflow files..."
122-
123- val sourceJarDirectories = List (s " target/scala- $scalaLibraryVersion/ " ,
124- s " api/target/scala- $scalaLibraryVersion/ " )
109+ // First step: Create directories
110+ createOrEmptyFolder(" deployDev"
125111
112+ // Second step: Create bin directories and copy all binaries
126113 val targetJarDirectories = List (" bin" " deploy/bin"
114+ prepareBinDirectories(logger, targetJarDirectories, scalaLibraryVersion)
127115
128- for (sourceDirectory <- sourceJarDirectories) {
129- copyJars(sourceDirectory, targetJarDirectories, logger)
130- }
131-
132- // Fourth step: Copy bootstrap launcher
116+ // Third step: Copy bootstrap launcher
133117 copyJars(s " bootstrap/target/scala- $scalaLibraryVersion/ " , List (" deploy/"
134118
135119 // Last step: Copy additional files
@@ -141,27 +125,68 @@ object BootstrapUtility {
141125 sbt.IO .copyDirectory(deploymentFiles, new File (" deploy/"
142126 logger info s " Finished copying additional deployment files. "
143127 }
128+ }
129+ }
144130
145- if (dev) {
146- val devDeploymentFiles = new File (" deployment-files-dev/"
147- if (! devDeploymentFiles.exists()) {
148- logger warn " Unable to find dev deployment files."
149- } else {
150- sbt.IO .copyDirectory(devDeploymentFiles, new File (" deploy/"
151- logger info " Finished copying additional dev deployment files."
152- }
131+ /**
132+ * Prepares the environment for a deployment for plugin developers.
133+ * Should be called after package and apiProject/packagedArtifacts task.
134+ *
135+ * @param logger the sbt logger
136+ * @param scalaLibraryVersion the scala library major version
137+ */
138+ def prepareDevDeploymentTask (logger : ManagedLogger , scalaLibraryVersion : String ): Unit = {
139+ // Assuming, before this: clean, package and apiProject/packagedArtifacts
140+ // Assuming: Hardcoded "bin/" and "deployDev/" folders
141+ // Assuming: A folder called "deployment-files-dev" with more additional files for plugin developers
153142
154- val requiredBuildFiles = Set (" BuildUtility.scala" " build.properties" " Plugin.scala" " PluginCreateWizard.scala"
155- " PluginLanguage.scala" " PluginMetadata.scala" " SbtFile.scala"
156- for (filepath <- requiredBuildFiles) {
157- val origFile = new File (s " project/ $filepath" )
158- val deployFile = new File (s " deploy/project/ $filepath" )
159- sbt.IO .copyFile(origFile, deployFile)
160- }
143+ withTaskInfo(" PREPARE DEV DEPLOYMENT"
144+
145+ logger info " Started deployment process for plugin dev environment."
146+
147+ // First step: Create directories
148+ createOrEmptyFolder(" deployDev"
149+
150+ // Second step: Copy all binaries
151+ val targetJarDirectories = List (" bin" " deployDev/bin"
152+ prepareBinDirectories(logger, targetJarDirectories, scalaLibraryVersion)
153+
154+ // Third step: Copy required meta-build files
155+ val requiredBuildFiles = Set (" BuildUtility.scala" " build.properties" " Plugin.scala" " PluginCreateWizard.scala"
156+ " PluginLanguage.scala" " PluginMetadata.scala" " SbtFile.scala"
157+
158+ for (filepath <- requiredBuildFiles) {
159+ val origFile = new File (s " project/ $filepath" )
160+ val deployFile = new File (s " deployDev/project/ $filepath" )
161+ sbt.IO .copyFile(origFile, deployFile)
162+ }
163+
164+ // Last step: Copy additional files
165+ val devDeploymentFiles = new File (" deployment-files-dev/"
166+ if (! devDeploymentFiles.exists()) {
167+ logger warn " Unable to find dev deployment files."
168+ } else {
169+ sbt.IO .copyDirectory(devDeploymentFiles, new File (" deployDev/"
170+ logger info " Finished copying additional dev deployment files."
161171 }
162172 }
163173 }
164174
175+ private def prepareBinDirectories (logger : ManagedLogger , targetDirs : List [String ], scalaLibraryVersion : String ): Unit = {
176+ // First prepare all bin folders
177+ targetDirs.foreach(d => {
178+ logger info s " Preparing ' $d' folder. "
179+ createOrEmptyFolder(d)
180+ })
181+
182+ // Then copy all binary files
183+ logger info " Copying chat overflow files..."
184+ val sourceJarDirectories = List (s " target/scala- $scalaLibraryVersion/ " ,
185+ s " api/target/scala- $scalaLibraryVersion/ " )
186+
187+ sourceJarDirectories.foreach(d => copyJars(d, targetDirs, logger))
188+ }
189+
165190 /**
166191 * Creates a directory or empties it, by recursively deleting files and sub directories.
167192 */
@@ -177,7 +202,7 @@ object BootstrapUtility {
177202 }
178203 }
179204 } else {
180- folder.mkdir ()
205+ folder.mkdirs ()
181206 }
182207 }
183208
0 commit comments