diff --git a/README.md b/README.md index a30144c391b..42728e77920 100644 --- a/README.md +++ b/README.md @@ -152,4 +152,9 @@ An additional tip is to set the following in `.gitconfig` to allow you to diff ` binary = true ``` +When the host is Windows, getting docker to behave as encoded in the pom.xml may be challenging, instead a command like this will probably work (replace your path to git root). Note that running this in git bash causes problems because of the /work in the command line arguments. (TODO integrate this command line way of running into the pom.xml so the original instructions work.) + +docker 'run' '--rm' '-t' '-v' 'D:\cdt\git\org.eclipse.cdt:/work' '-w' '/work/core/org.eclipse.cdt.core.native' 'quay.io/eclipse-cdt/cdt-infra-eclipse-full:latest' 'make' '-C' 'native_src' 'rebuild' + See also `jniheaders` profile above. + diff --git a/core/org.eclipse.cdt.core.native/native_src/Makefile b/core/org.eclipse.cdt.core.native/native_src/Makefile index 9b7275d57e8..5815c72d446 100644 --- a/core/org.eclipse.cdt.core.native/native_src/Makefile +++ b/core/org.eclipse.cdt.core.native/native_src/Makefile @@ -30,6 +30,7 @@ ifeq ($(UNAME),Linux) LIBS = \ $(OS_DIR_WIN32_X86_64)/starter.exe \ $(OS_DIR_WIN32_X86_64)/spawner.dll \ + $(OS_DIR_WIN32_X86_64)/pty.dll \ $(OS_DIR_LINUX_X86_64)/libspawner.so \ $(OS_DIR_LINUX_X86_64)/libpty.so \ $(OS_DIR_LINUX_AARCH64)/libspawner.so \ @@ -82,6 +83,14 @@ $(OS_DIR_WIN32_X86_64)/spawner.dll: win/iostream.c win/raise.c win/spawner.c win win/iostream.c win/raise.c win/spawner.c win/Win32ProcessEx.c \ -Wl,--kill-at --shared +$(OS_DIR_WIN32_X86_64)/pty.dll: win/pty.cpp win/pty_dllmain.cpp + mkdir -p $(dir $@) && \ + SOURCE_DATE_EPOCH=$(shell git log -1 --pretty=format:%ct -- .) \ + x86_64-w64-mingw32-g++ -o $@ -Iinclude -Iwin/include -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/win32" \ + -DUNICODE \ + win/pty.cpp win/pty_dllmain.cpp \ + -Wl,--kill-at --shared -L$(OS_DIR_WIN32_X86_64) -lwinpty # -static-libstdc++ -static-libgcc + # Linux x86_64 $(OS_DIR_LINUX_X86_64)/libspawner.so: unix/spawner.c unix/io.c unix/exec_unix.c unix/exec_pty.c unix/openpty.c unix/pfind.c mkdir -p $(dir $@) && \ diff --git a/core/org.eclipse.cdt.core.native/native_src/win/include/winpty.h b/core/org.eclipse.cdt.core.native/native_src/win/include/winpty.h new file mode 100644 index 00000000000..41e36434812 --- /dev/null +++ b/core/org.eclipse.cdt.core.native/native_src/win/include/winpty.h @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2011-2012 Ryan Prichard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef WINPTY_H +#define WINPTY_H + +#include +#include + +#ifdef WINPTY +#define WINPTY_API __declspec(dllexport) +#else +#define WINPTY_API __declspec(dllimport) +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct winpty_s winpty_t; + +/* + * winpty API. + */ + +/* + * Starts a new winpty instance with the given size. + * + * This function creates a new agent process and connects to it. + */ +WINPTY_API winpty_t *winpty_open(int cols, int rows); + +/* + * Start a child process. Either (but not both) of appname and cmdline may + * be NULL. cwd and env may be NULL. env is a pointer to an environment + * block like that passed to CreateProcess. + * + * This function never modifies the cmdline, unlike CreateProcess. + * + * Only one child process may be started. After the child process exits, the + * agent will scrape the console output one last time, then close the data pipe + * once all remaining data has been sent. + * + * Returns 0 on success or a Win32 error code on failure. + */ +WINPTY_API int winpty_start_process(winpty_t *pc, + const wchar_t *appname, + const wchar_t *cmdline, + const wchar_t *cwd, + const wchar_t *env); + +/* + * Returns the exit code of the process started with winpty_start_process, + * or -1 none is available. + */ +WINPTY_API int winpty_get_exit_code(winpty_t *pc); + +/* + * Returns the process id of the process started with winpty_start_process, + * or -1 none is available. + */ +WINPTY_API int winpty_get_process_id(winpty_t *pc); + +/* + * Returns an overlapped-mode pipe handle that can be read and written + * like a Unix terminal. + */ +WINPTY_API HANDLE winpty_get_data_pipe(winpty_t *pc); + +/* + * Change the size of the Windows console. + */ +WINPTY_API int winpty_set_size(winpty_t *pc, int cols, int rows); + +/* + * Toggle the console mode. If in console mode, no terminal escape sequences are send. + */ +WINPTY_API int winpty_set_console_mode(winpty_t *pc, int mode); + +/* + * Closes the winpty. + */ +WINPTY_API void winpty_close(winpty_t *pc); + +#ifdef __cplusplus +} +#endif + +#endif /* WINPTY_H */ diff --git a/core/org.eclipse.cdt.core.win32/library/pty/jni/src/pty.cpp b/core/org.eclipse.cdt.core.native/native_src/win/pty.cpp similarity index 97% rename from core/org.eclipse.cdt.core.win32/library/pty/jni/src/pty.cpp rename to core/org.eclipse.cdt.core.native/native_src/win/pty.cpp index f7aef2a3d6a..36dafed9641 100644 --- a/core/org.eclipse.cdt.core.win32/library/pty/jni/src/pty.cpp +++ b/core/org.eclipse.cdt.core.native/native_src/win/pty.cpp @@ -12,9 +12,9 @@ * Wind River Systems - initial API and implementation *******************************************************************************/ -#include "PTY.h" -#include "PTYInputStream.h" -#include "PTYOutputStream.h" +#include "org_eclipse_cdt_utils_pty_PTY.h" +#include "org_eclipse_cdt_utils_pty_PTYInputStream.h" +#include "org_eclipse_cdt_utils_pty_PTYOutputStream.h" #include "winpty.h" #include @@ -316,12 +316,11 @@ static std::wstring argvToCommandLine(const std::vector &argv) * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[ILjava/lang/String;IZ)I */ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_exec2 - (JNIEnv *env, jobject jobj, jobjectArray jcmd, jobjectArray jenv, jstring jdir, jintArray jchannels, jstring jslaveName, jint masterFD, jboolean console) + (JNIEnv *env, jobject jobj, jobjectArray jcmd, jobjectArray jenv, jstring jdir, jobjectArray jchannels, jstring jslaveName, jint masterFD, jboolean console) { int fd; std::map :: iterator fd2pty_Iter; - jint *channels = env->GetIntArrayElements(jchannels, 0); const wchar_t *cwdW = (const wchar_t *) env->GetStringChars(jdir, NULL); const char *pts_name = env->GetStringUTFChars(jslaveName, NULL); @@ -331,7 +330,7 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_exec2 jint argc = env->GetArrayLength(jcmd); jint envc = env->GetArrayLength(jenv); - if (channels == NULL) + if (jchannels == NULL || env->GetArrayLength(jchannels) != 3) goto bail_out; fd = masterFD; @@ -378,7 +377,6 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_exec2 } bail_out: - env->ReleaseIntArrayElements(jchannels, channels, 0); env->ReleaseStringChars(jdir, (const jchar *) cwdW); env->ReleaseStringUTFChars(jslaveName, pts_name); diff --git a/core/org.eclipse.cdt.core.win32/library/pty/jni/src/dllmain.cpp b/core/org.eclipse.cdt.core.native/native_src/win/pty_dllmain.cpp similarity index 96% rename from core/org.eclipse.cdt.core.win32/library/pty/jni/src/dllmain.cpp rename to core/org.eclipse.cdt.core.native/native_src/win/pty_dllmain.cpp index c19f2ebbdcc..a5b138c8c45 100644 --- a/core/org.eclipse.cdt.core.win32/library/pty/jni/src/dllmain.cpp +++ b/core/org.eclipse.cdt.core.native/native_src/win/pty_dllmain.cpp @@ -68,4 +68,6 @@ FARPROC WINAPI PTYDliNotifyHook( unsigned dliNotify, PDelayLoadInfo pdli ) return NULL; } -extern "C" PfnDliHook __pfnDliNotifyHook2 = PTYDliNotifyHook; +extern "C" { +PfnDliHook __pfnDliNotifyHook2 = PTYDliNotifyHook; +} diff --git a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java index 4080fa25b8c..fbe1f377665 100644 --- a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java +++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java @@ -262,18 +262,22 @@ public class PTY { static { try { + if (Platform.OS_WIN32.equals(Platform.getOS())) { + // When we used to build with VC++ we used DelayLoadDLLs (See Gerrit 167674 and Bug 521515) so that the winpty + // could be found. When we ported to mingw we didn't port across this feature because it was simpler to just + // manually load winpty first. + System.loadLibrary("winpty"); //$NON-NLS-1$ + } System.loadLibrary("pty"); //$NON-NLS-1$ hasPTY = true; isWinPTY = Platform.OS_WIN32.equals(Platform.getOS()); // on windows console mode is not supported except for experimental use // to enable it, set system property org.eclipse.cdt.core.winpty_console_mode=true isConsoleModeSupported = !isWinPTY || Boolean.getBoolean("org.eclipse.cdt.core.winpty_console_mode"); //$NON-NLS-1$ - } catch (SecurityException e) { - // Comment out it worries the users too much - //CCorePlugin.log(e); - } catch (UnsatisfiedLinkError e) { - // Comment out it worries the users too much - //CCorePlugin.log(e); + } catch (SecurityException | UnsatisfiedLinkError e) { + CNativePlugin.log( + "Failed to load the PTY library. This may indicate a configuration problem, but can be ignored if no further problems are observed.", //$NON-NLS-1$ + e); } } diff --git a/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/pty.dll b/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/pty.dll index 221ac7deab5..d43a8c249b6 100755 Binary files a/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/pty.dll and b/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/pty.dll differ diff --git a/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/spawner.dll b/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/spawner.dll index 45c8789beb0..8a3490f3fa3 100755 Binary files a/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/spawner.dll and b/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/spawner.dll differ diff --git a/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/starter.exe b/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/starter.exe index 7d6b4f8df59..1f456e4dc85 100755 Binary files a/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/starter.exe and b/core/org.eclipse.cdt.core.win32.x86_64/os/win32/x86_64/starter.exe differ diff --git a/core/org.eclipse.cdt.core.win32/build.properties b/core/org.eclipse.cdt.core.win32/build.properties index 41066b2e23d..eadebecf134 100644 --- a/core/org.eclipse.cdt.core.win32/build.properties +++ b/core/org.eclipse.cdt.core.win32/build.properties @@ -16,6 +16,5 @@ bin.includes = fragment.xml,\ .,\ META-INF/,\ plugin.properties -src.includes = about.html,\ - library/ +src.includes = about.html source.. = src/ diff --git a/core/org.eclipse.cdt.core.win32/library/.gitignore b/core/org.eclipse.cdt.core.win32/library/.gitignore deleted file mode 100644 index 2105ba251e3..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/build -/ipch/ -*.obj -*.idb -*.pdb -*.sdf -*.suo -*.pch -*.log diff --git a/core/org.eclipse.cdt.core.win32/library/pty/jni/include/PTY.h b/core/org.eclipse.cdt.core.win32/library/pty/jni/include/PTY.h deleted file mode 100644 index d73d5c00e16..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/pty/jni/include/PTY.h +++ /dev/null @@ -1,45 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_eclipse_cdt_utils_pty_PTY */ - -#ifndef _Included_org_eclipse_cdt_utils_pty_PTY -#define _Included_org_eclipse_cdt_utils_pty_PTY -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_eclipse_cdt_utils_pty_PTY - * Method: openMaster - * Signature: (Z)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_eclipse_cdt_utils_pty_PTY_openMaster - (JNIEnv *, jobject, jboolean); - -/* - * Class: org_eclipse_cdt_utils_pty_PTY - * Method: change_window_size - * Signature: (III)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_change_1window_1size - (JNIEnv *, jobject, jint, jint, jint); - -/* - * Class: org_eclipse_cdt_utils_pty_PTY - * Method: exec2 - * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[ILjava/lang/String;IZ)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_exec2 - (JNIEnv *, jobject, jobjectArray, jobjectArray, jstring, jintArray, jstring, jint, jboolean); - -/* - * Class: org_eclipse_cdt_utils_pty_PTY - * Method: waitFor - * Signature: (II)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_waitFor - (JNIEnv *, jobject, jint, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/core/org.eclipse.cdt.core.win32/library/pty/jni/include/PTYInputStream.h b/core/org.eclipse.cdt.core.win32/library/pty/jni/include/PTYInputStream.h deleted file mode 100644 index 7767be6bd8c..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/pty/jni/include/PTYInputStream.h +++ /dev/null @@ -1,31 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_eclipse_cdt_utils_pty_PTYInputStream */ - -#ifndef _Included_org_eclipse_cdt_utils_pty_PTYInputStream -#define _Included_org_eclipse_cdt_utils_pty_PTYInputStream -#ifdef __cplusplus -extern "C" { -#endif -#undef org_eclipse_cdt_utils_pty_PTYInputStream_MAX_SKIP_BUFFER_SIZE -#define org_eclipse_cdt_utils_pty_PTYInputStream_MAX_SKIP_BUFFER_SIZE 2048L -/* - * Class: org_eclipse_cdt_utils_pty_PTYInputStream - * Method: read0 - * Signature: (I[BI)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYInputStream_read0 - (JNIEnv *, jobject, jint, jbyteArray, jint); - -/* - * Class: org_eclipse_cdt_utils_pty_PTYInputStream - * Method: close0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYInputStream_close0 - (JNIEnv *, jobject, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/core/org.eclipse.cdt.core.win32/library/pty/jni/include/PTYOutputStream.h b/core/org.eclipse.cdt.core.win32/library/pty/jni/include/PTYOutputStream.h deleted file mode 100644 index fb28491060e..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/pty/jni/include/PTYOutputStream.h +++ /dev/null @@ -1,29 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_eclipse_cdt_utils_pty_PTYOutputStream */ - -#ifndef _Included_org_eclipse_cdt_utils_pty_PTYOutputStream -#define _Included_org_eclipse_cdt_utils_pty_PTYOutputStream -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_eclipse_cdt_utils_pty_PTYOutputStream - * Method: write0 - * Signature: (I[BI)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYOutputStream_write0 - (JNIEnv *, jobject, jint, jbyteArray, jint); - -/* - * Class: org_eclipse_cdt_utils_pty_PTYOutputStream - * Method: close0 - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTYOutputStream_close0 - (JNIEnv *, jobject, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/core/org.eclipse.cdt.core.win32/library/pty/pty.sln b/core/org.eclipse.cdt.core.win32/library/pty/pty.sln deleted file mode 100644 index 220c281aade..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/pty/pty.sln +++ /dev/null @@ -1,46 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pty", "pty.vcxproj", "{5589D515-1C56-4641-97CF-3C4561109258}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winpty", "winpty.vcxproj", "{D7BFF73A-A86A-47FF-AD2B-CC2EFCAD5ABD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winpty-agent", "winpty-agent.vcxproj", "{E7A42398-12E7-4BC1-B72B-5D62B71E9816}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5589D515-1C56-4641-97CF-3C4561109258}.Debug|Win32.ActiveCfg = Debug|Win32 - {5589D515-1C56-4641-97CF-3C4561109258}.Debug|Win32.Build.0 = Debug|Win32 - {5589D515-1C56-4641-97CF-3C4561109258}.Debug|x64.ActiveCfg = Debug|x64 - {5589D515-1C56-4641-97CF-3C4561109258}.Debug|x64.Build.0 = Debug|x64 - {5589D515-1C56-4641-97CF-3C4561109258}.Release|Win32.ActiveCfg = Release|Win32 - {5589D515-1C56-4641-97CF-3C4561109258}.Release|Win32.Build.0 = Release|Win32 - {5589D515-1C56-4641-97CF-3C4561109258}.Release|x64.ActiveCfg = Release|x64 - {5589D515-1C56-4641-97CF-3C4561109258}.Release|x64.Build.0 = Release|x64 - {D7BFF73A-A86A-47FF-AD2B-CC2EFCAD5ABD}.Debug|Win32.ActiveCfg = Debug|Win32 - {D7BFF73A-A86A-47FF-AD2B-CC2EFCAD5ABD}.Debug|Win32.Build.0 = Debug|Win32 - {D7BFF73A-A86A-47FF-AD2B-CC2EFCAD5ABD}.Debug|x64.ActiveCfg = Debug|x64 - {D7BFF73A-A86A-47FF-AD2B-CC2EFCAD5ABD}.Debug|x64.Build.0 = Debug|x64 - {D7BFF73A-A86A-47FF-AD2B-CC2EFCAD5ABD}.Release|Win32.ActiveCfg = Release|Win32 - {D7BFF73A-A86A-47FF-AD2B-CC2EFCAD5ABD}.Release|Win32.Build.0 = Release|Win32 - {D7BFF73A-A86A-47FF-AD2B-CC2EFCAD5ABD}.Release|x64.ActiveCfg = Release|x64 - {D7BFF73A-A86A-47FF-AD2B-CC2EFCAD5ABD}.Release|x64.Build.0 = Release|x64 - {E7A42398-12E7-4BC1-B72B-5D62B71E9816}.Debug|Win32.ActiveCfg = Debug|Win32 - {E7A42398-12E7-4BC1-B72B-5D62B71E9816}.Debug|Win32.Build.0 = Debug|Win32 - {E7A42398-12E7-4BC1-B72B-5D62B71E9816}.Debug|x64.ActiveCfg = Debug|x64 - {E7A42398-12E7-4BC1-B72B-5D62B71E9816}.Debug|x64.Build.0 = Debug|x64 - {E7A42398-12E7-4BC1-B72B-5D62B71E9816}.Release|Win32.ActiveCfg = Release|Win32 - {E7A42398-12E7-4BC1-B72B-5D62B71E9816}.Release|Win32.Build.0 = Release|Win32 - {E7A42398-12E7-4BC1-B72B-5D62B71E9816}.Release|x64.ActiveCfg = Release|x64 - {E7A42398-12E7-4BC1-B72B-5D62B71E9816}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/core/org.eclipse.cdt.core.win32/library/pty/pty.vcxproj b/core/org.eclipse.cdt.core.win32/library/pty/pty.vcxproj deleted file mode 100644 index 7d526ce88b1..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/pty/pty.vcxproj +++ /dev/null @@ -1,177 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {5589D515-1C56-4641-97CF-3C4561109258} - Win32Proj - pty - - - - DynamicLibrary - true - Unicode - Windows7.1SDK - - - DynamicLibrary - true - Unicode - Windows7.1SDK - - - DynamicLibrary - false - true - Unicode - Windows7.1SDK - - - DynamicLibrary - false - true - Unicode - Windows7.1SDK - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - true - $(Platform)\$(Configuration)\$(ProjectName)\ - - - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - false - $(Platform)\$(Configuration)\$(ProjectName)\ - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ./jni/include;C:\NoScan\Apps\Java\jdk1.6.0_31\include;C:\NoScan\Apps\Java\jdk1.6.0_31\include\win32;..\winpty\include;.;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Windows - true - DelayImp.lib;winpty.lib;%(AdditionalDependencies) - $(SolutionDir)$(Platform)\$(Configuration)\ - winpty.dll;%(DelayLoadDLLs) - - - - - NotUsing - Level3 - Disabled - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ./jni/include;C:\NoScan\Apps\Java\jdk1.6.0_31\include;C:\NoScan\Apps\Java\jdk1.6.0_31\include\win32;..\winpty\include;.;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Windows - true - DelayImp.lib;winpty.lib;%(AdditionalDependencies) - $(SolutionDir)$(Platform)\$(Configuration)\ - winpty.dll;%(DelayLoadDLLs) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ./jni/include;C:\NoScan\Apps\Java\jdk1.6.0_31\include;C:\NoScan\Apps\Java\jdk1.6.0_31\include\win32;..\winpty\include;.;%(AdditionalIncludeDirectories) - MultiThreaded - - - Windows - true - true - true - DelayImp.lib;winpty.lib;%(AdditionalDependencies) - $(SolutionDir)$(Platform)\$(Configuration)\ - winpty.dll;%(DelayLoadDLLs) - - - - - Level3 - - - MaxSpeed - true - true - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ./jni/include;C:\NoScan\Apps\Java\jdk1.6.0_31\include;C:\NoScan\Apps\Java\jdk1.6.0_31\include\win32;..\winpty\include;.;%(AdditionalIncludeDirectories) - MultiThreaded - - - Windows - true - true - true - DelayImp.lib;winpty.lib;%(AdditionalDependencies) - $(SolutionDir)$(Platform)\$(Configuration)\ - winpty.dll;%(DelayLoadDLLs) - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/org.eclipse.cdt.core.win32/library/pty/pty.vcxproj.filters b/core/org.eclipse.cdt.core.win32/library/pty/pty.vcxproj.filters deleted file mode 100644 index b92d3375bf7..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/pty/pty.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {679c3039-d4a8-48db-9a3b-33f73f3b44c0} - - - {b7f98685-8f42-40d2-bd2b-65bcbac17645} - - - - - include - - - include - - - include - - - - - src - - - src - - - \ No newline at end of file diff --git a/core/org.eclipse.cdt.core.win32/library/pty/winpty-agent.vcxproj b/core/org.eclipse.cdt.core.win32/library/pty/winpty-agent.vcxproj deleted file mode 100644 index 0eef37a0900..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/pty/winpty-agent.vcxproj +++ /dev/null @@ -1,185 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E7A42398-12E7-4BC1-B72B-5D62B71E9816} - Win32Proj - winptyagent - - - - Application - true - Unicode - Windows7.1SDK - - - Application - true - Unicode - Windows7.1SDK - - - Application - false - true - Unicode - Windows7.1SDK - - - Application - false - true - Unicode - Windows7.1SDK - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - - NotUsing - Level3 - Disabled - WIN32;_WINDOWS;NOMINMAX;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\winpty\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - - - - - NotUsing - Level3 - Disabled - WIN32;_WINDOWS;NOMINMAX;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\winpty\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;_WINDOWS;NOMINMAX;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\winpty\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - false - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;_WINDOWS;NOMINMAX;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\winpty\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - false - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/org.eclipse.cdt.core.win32/library/pty/winpty-agent.vcxproj.filters b/core/org.eclipse.cdt.core.win32/library/pty/winpty-agent.vcxproj.filters deleted file mode 100644 index 46cdf6beaa8..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/pty/winpty-agent.vcxproj.filters +++ /dev/null @@ -1,90 +0,0 @@ - - - - - {a7174beb-334f-4496-868c-348a80e5f4d8} - - - {0c9e153d-99b4-4f47-ba3c-57e53e1c71b7} - - - - - shared - - - shared - - - shared - - - shared - - - agent - - - agent - - - agent - - - agent - - - agent - - - agent - - - agent - - - agent - - - agent - - - agent - - - - - shared - - - agent - - - agent - - - agent - - - agent - - - agent - - - agent - - - agent - - - agent - - - agent - - - agent - - - \ No newline at end of file diff --git a/core/org.eclipse.cdt.core.win32/library/pty/winpty.vcxproj b/core/org.eclipse.cdt.core.win32/library/pty/winpty.vcxproj deleted file mode 100644 index e83366bc905..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/pty/winpty.vcxproj +++ /dev/null @@ -1,167 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {D7BFF73A-A86A-47FF-AD2B-CC2EFCAD5ABD} - Win32Proj - winpty - - - - DynamicLibrary - true - Unicode - Windows7.1SDK - - - DynamicLibrary - true - Unicode - Windows7.1SDK - - - DynamicLibrary - false - true - Unicode - Windows7.1SDK - - - DynamicLibrary - false - true - Unicode - Windows7.1SDK - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - - NotUsing - Level3 - Disabled - WIN32;NOMINMAX;_DEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WINPTY;%(PreprocessorDefinitions) - ..\winpty\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Windows - true - - - - - NotUsing - Level3 - Disabled - WIN32;_WINDOWS;NOMINMAX;_DEBUG;_USRDLL;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WINPTY;%(PreprocessorDefinitions) - ..\winpty\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Windows - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NOMINMAX;NDEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WINPTY;%(PreprocessorDefinitions) - ..\winpty\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Windows - false - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;_WINDOWS;NOMINMAX;NDEBUG;_USRDLL;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WINPTY;%(PreprocessorDefinitions) - ..\winpty\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Windows - false - true - true - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/org.eclipse.cdt.core.win32/library/pty/winpty.vcxproj.filters b/core/org.eclipse.cdt.core.win32/library/pty/winpty.vcxproj.filters deleted file mode 100644 index 86016e30242..00000000000 --- a/core/org.eclipse.cdt.core.win32/library/pty/winpty.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - {6f8f9f7f-1797-423e-9189-990b2baff405} - - - {6fa1f334-3a7c-4a8c-970b-15c2a6a08ba2} - - - {84962cba-90e7-4b83-8656-6563b933bb73} - - - - - shared - - - shared - - - shared - - - shared - - - include - - - - - shared - - - libwinpty - - - \ No newline at end of file