Merge pull request #66 from ModOrganizer2/revert-54-master

Revert "Moving things around"

.gitignore

@@ -2,6 +2,5 @@
 /vs/obj
 /vs/.vs
 /vs/*.user
-/.vs
 /mob.exe
 /mob.log

src/core/conf.cpp

@@ -1187,7 +1187,7 @@ void init_options(
 
 	make_canonical_path(
 		"install_pythoncore",
-		paths::install_dlls(), "pythoncore");
+		paths::install_bin(), "pythoncore");
 
 	make_canonical_path(
 		"install_stylesheets",
@@ -1195,7 +1195,7 @@ void init_options(
 
 	make_canonical_path(
 		"install_translations",
-		paths::install_bin(), "resources/translations");
+		paths::install_bin(), "translations");
 
 	conf::set_global("tools", "iscc", path_to_utf8(find_iscc()));
 }

src/tasks/boost.cpp

@@ -124,7 +124,7 @@ void boost::build_and_install_prebuilt()
 	{
 		op::copy_file_to_dir_if_better(cx(),
 			lib_path(arch::x64) / python_dll(),
-			paths::install_dlls());
+			paths::install_bin());
 	});
 }
 
@@ -193,7 +193,7 @@ void boost::build_and_install_from_source()
 	{
 		op::copy_file_to_dir_if_better(cx(),
 			lib_path(arch::x64) / python_dll(),
-			paths::install_dlls());
+			paths::install_bin());
 	});
 }
 

src/tasks/openssl.cpp

@@ -187,6 +187,7 @@ void openssl::install_engines()
 void openssl::copy_files()
 {
 	copy_dlls_to(paths::install_bin());
+	copy_dlls_to(paths::install_dlls());
 	copy_pdbs_to(paths::install_pdbs());
 }
 

src/tasks/python.cpp

@@ -209,12 +209,12 @@ void python::copy_files()
 
 	op::copy_glob_to_dir_if_better(cx(),
 		build_path() / "libffi*.dll",
-		paths::install_dlls(),
+		paths::install_bin(),
 		op::copy_files);
 
 	op::copy_file_to_dir_if_better(cx(),
 		build_path() / ("python" + version_for_dll() + ".dll"),
-		paths::install_dlls());
+		paths::install_bin());
 
 	op::copy_file_to_dir_if_better(cx(),
 		build_path() / ("python" + version_for_dll() + ".pdb"),
@@ -227,7 +227,7 @@ void python::copy_files()
 
 	op::copy_file_to_file_if_better(cx(),
 		build_path() / "pythoncore" / ("python" + version_for_dll() + ".zip"),
-		paths::install_dlls() / "pythoncore.zip",
+		paths::install_bin() / "pythoncore.zip",
 		op::copy_files);
 }