summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>2009-02-10 12:00:47 +0000
committercyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>2009-02-10 12:00:47 +0000
commite7a6661baa7ff8bffce9e18a45d5ea4a521347e1 (patch)
treeac7a9c4a63c39b29adb5bd96002bae50d23ce242
parent018f1a50b28a91398b278f4ab4de1d3a365250a2 (diff)
Do not pack the build directory into the tarballs from now on, also fix subtle error in install.js for Windows when the last characters of the script's path is a backslash.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1972 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--CMakeLists.txt2
-rw-r--r--install.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29674c383..1e84884f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -496,7 +496,7 @@ macro(add_to_cpack_ignored_files ITEM)
endmacro(add_to_cpack_ignored_files)
# Add the initial files to ignore which will be ignored regardless of if you are building in-source or out-of-source
-add_to_cpack_ignored_files(".git\;config.cache\;.svn\;CMakeFiles\;sysconf.h$\;Makefile.inc$\;config.log\;config.status" TRUE)
+add_to_cpack_ignored_files(".git\;config.cache\;.svn\;CMakeFiles\;sysconf.h$\;Makefile.inc$\;config.log\;config.status\;build" TRUE)
# Add the files we don't want the periods converted for
add_to_cpack_ignored_files(".\\\\\\\\.so$;.\\\\\\\\.o$;.\\\\\\\\.s$;${Anope_SOURCE_DIR}/Makefile$")
# If the two directories are the same, we are building in-source, thus we need to ignore more files from the build
diff --git a/install.js b/install.js
index e136257c5..fc5d21e65 100644
--- a/install.js
+++ b/install.js
@@ -214,7 +214,8 @@ for (x in installerQuestions) {
var thisQuestion = installerQuestions[x];
cmake += ' ' + thisQuestion.cmake_argument();
}
-cmake += ' "' + ScriptPath + '"';
+var fixedScriptPath = ScriptPath.replace(/\\/g, '/');
+cmake += ' "' + fixedScriptPath + '"';
WScript.Echo(cmake + "\n");
var shell = WScript.CreateObject('WScript.Shell');