diff options
author | Justin Clark-Casey (justincc) | 2012-11-14 02:25:07 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-14 02:25:07 +0000 |
commit | 90c6d2e50cc22ebca3b1be7127d68aaadcdef4e1 (patch) | |
tree | 58459013c7b809ebc4bd0ee64fd1ce7d40a5fc03 | |
parent | minor: Add some explanative method doc to SceneHelpers.SetupSceneModules() (diff) | |
download | opensim-SC-90c6d2e50cc22ebca3b1be7127d68aaadcdef4e1.zip opensim-SC-90c6d2e50cc22ebca3b1be7127d68aaadcdef4e1.tar.gz opensim-SC-90c6d2e50cc22ebca3b1be7127d68aaadcdef4e1.tar.bz2 opensim-SC-90c6d2e50cc22ebca3b1be7127d68aaadcdef4e1.tar.xz |
Stop Prebuild from generating <copy> statements which unnecessarily copy files into bin/Debug or bin/Release
nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug
However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly https://github.com/nant/nant/pull/39).
Which makes nant time-consumingly copy these files when the aren't actually used.
Tested removal of <copy> on both nant 0.91 and nant 0.92
Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention.
Diffstat (limited to '')
-rwxr-xr-x | Prebuild/Prebuild.exe | bin | 226816 -> 0 bytes | |||
-rw-r--r-- | Prebuild/src/Core/Targets/NAntTarget.cs | 43 | ||||
-rwxr-xr-x | bin/Prebuild.exe | bin | 226816 -> 229376 bytes |
3 files changed, 0 insertions, 43 deletions
diff --git a/Prebuild/Prebuild.exe b/Prebuild/Prebuild.exe deleted file mode 100755 index bdb25b6..0000000 --- a/Prebuild/Prebuild.exe +++ /dev/null | |||
Binary files differ | |||
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs index 1966f66..9a86767 100644 --- a/Prebuild/src/Core/Targets/NAntTarget.cs +++ b/Prebuild/src/Core/Targets/NAntTarget.cs | |||
@@ -209,49 +209,6 @@ namespace Prebuild.Core.Targets | |||
209 | ss.WriteLine(" <target name=\"{0}\">", "build"); | 209 | ss.WriteLine(" <target name=\"{0}\">", "build"); |
210 | ss.WriteLine(" <echo message=\"Build Directory is ${project::get-base-directory()}/${build.dir}\" />"); | 210 | ss.WriteLine(" <echo message=\"Build Directory is ${project::get-base-directory()}/${build.dir}\" />"); |
211 | ss.WriteLine(" <mkdir dir=\"${project::get-base-directory()}/${build.dir}\" />"); | 211 | ss.WriteLine(" <mkdir dir=\"${project::get-base-directory()}/${build.dir}\" />"); |
212 | ss.WriteLine(" <copy todir=\"${project::get-base-directory()}/${build.dir}\" flatten=\"true\">"); | ||
213 | ss.WriteLine(" <fileset basedir=\"${project::get-base-directory()}\">"); | ||
214 | foreach (ReferenceNode refr in project.References) | ||
215 | { | ||
216 | if (refr.LocalCopy) | ||
217 | { | ||
218 | ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)) + "\" />", '/')); | ||
219 | } | ||
220 | } | ||
221 | |||
222 | ss.WriteLine(" </fileset>"); | ||
223 | ss.WriteLine(" </copy>"); | ||
224 | if (project.ConfigFile != null && project.ConfigFile.Length!=0) | ||
225 | { | ||
226 | ss.Write(" <copy file=\"" + project.ConfigFile + "\" tofile=\"${project::get-base-directory()}/${build.dir}/${project::get-name()}"); | ||
227 | |||
228 | if (project.Type == ProjectType.Library) | ||
229 | { | ||
230 | ss.Write(".dll.config\""); | ||
231 | } | ||
232 | else | ||
233 | { | ||
234 | ss.Write(".exe.config\""); | ||
235 | } | ||
236 | ss.WriteLine(" />"); | ||
237 | } | ||
238 | |||
239 | // Add the content files to just be copied | ||
240 | ss.WriteLine(" {0}", "<copy todir=\"${project::get-base-directory()}/${build.dir}\">"); | ||
241 | ss.WriteLine(" {0}", "<fileset basedir=\".\">"); | ||
242 | |||
243 | foreach (string file in project.Files) | ||
244 | { | ||
245 | // Ignore if we aren't content | ||
246 | if (project.Files.GetBuildAction(file) != BuildAction.Content) | ||
247 | continue; | ||
248 | |||
249 | // Create a include tag | ||
250 | ss.WriteLine(" {0}", "<include name=\"" + Helper.NormalizePath(PrependPath(file), '/') + "\" />"); | ||
251 | } | ||
252 | |||
253 | ss.WriteLine(" {0}", "</fileset>"); | ||
254 | ss.WriteLine(" {0}", "</copy>"); | ||
255 | 212 | ||
256 | ss.Write(" <csc "); | 213 | ss.Write(" <csc "); |
257 | ss.Write(" target=\"{0}\"", project.Type.ToString().ToLower()); | 214 | ss.Write(" target=\"{0}\"", project.Type.ToString().ToLower()); |
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index bdb25b6..a202443 100755 --- a/bin/Prebuild.exe +++ b/bin/Prebuild.exe | |||
Binary files differ | |||