From da68257b133cb0da361829edf7ac1ff7c483568e Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Thu, 9 Apr 2015 19:57:23 -0400 Subject: [PATCH] Remove some netbeans project cruft --- .gitignore | 1 + nbproject/configurations.xml | 9 ++ .../CodeAssistancePathMapper.properties | 1 - nbproject/private/Default-build.log | 12 -- nbproject/private/Default-exec.log | 16 --- nbproject/private/Default.properties | 6 - nbproject/private/configurations.xml | 104 ------------------ nbproject/private/launcher.properties | 40 ------- nbproject/private/private.xml | 18 --- 9 files changed, 10 insertions(+), 197 deletions(-) delete mode 100644 nbproject/private/CodeAssistancePathMapper.properties delete mode 100644 nbproject/private/Default-build.log delete mode 100644 nbproject/private/Default-exec.log delete mode 100644 nbproject/private/Default.properties delete mode 100644 nbproject/private/configurations.xml delete mode 100644 nbproject/private/launcher.properties delete mode 100644 nbproject/private/private.xml diff --git a/.gitignore b/.gitignore index 9f4bbed..2b8f820 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ obj/* build/* **/*.o Tyro.app/* +nbproject/private/* diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 0c781ed..584ed4f 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -5,6 +5,13 @@ jsoncpp.cpp + + + + resource.rc + + + SFTP.cpp @@ -85,6 +92,8 @@ + + diff --git a/nbproject/private/CodeAssistancePathMapper.properties b/nbproject/private/CodeAssistancePathMapper.properties deleted file mode 100644 index 7f5ded8..0000000 --- a/nbproject/private/CodeAssistancePathMapper.properties +++ /dev/null @@ -1 +0,0 @@ -# Automatic path mapper. CRC = 1 diff --git a/nbproject/private/Default-build.log b/nbproject/private/Default-build.log deleted file mode 100644 index b613bf9..0000000 --- a/nbproject/private/Default-build.log +++ /dev/null @@ -1,12 +0,0 @@ -make: wx-config: Command not found -Os -I./src -I./include -fPIC -c -o src/network/SFTP.o src/network/SFTP.cpp -make: Os: No such file or directory -make: [src/network/SFTP.o] Error 1 (ignored) -make: wx-config: Command not found -Os -I./src -I./include -fPIC -c -o include/jsoncpp.o include/jsoncpp.cpp -make: Os: No such file or directory -make: [include/jsoncpp.o] Error 1 (ignored) -ar rcs build/Tyro.a src/network/SFTP.o include/jsoncpp.o -ar: src/network/SFTP.o: No such file or directory -ar: include/jsoncpp.o: No such file or directory -make: *** [build/Tyro.a] Error 1 diff --git a/nbproject/private/Default-exec.log b/nbproject/private/Default-exec.log deleted file mode 100644 index ccf31fd..0000000 --- a/nbproject/private/Default-exec.log +++ /dev/null @@ -1,16 +0,0 @@ -called: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar - /Users/twarren/Tyro - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar - rcs - build/Tyro.a - src/network/SFTP.o - include/jsoncpp.o - -called: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar - /Users/twarren/Tyro - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar - rcs - build/Tyro.a - src/network/SFTP.o - include/jsoncpp.o - diff --git a/nbproject/private/Default.properties b/nbproject/private/Default.properties deleted file mode 100644 index 3974a03..0000000 --- a/nbproject/private/Default.properties +++ /dev/null @@ -1,6 +0,0 @@ -/home/twarren/Tyro/include/jsoncpp.cpp=/home/twarren/Tyro#-Os -I./src -I./include -fPIC -c -o include/jsoncpp.o include/jsoncpp.cpp -/home/twarren/Tyro/src/widgets/TabContainer.cpp=/home/twarren/Tyro#-I/usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-3.0 -I/usr/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread src/TyroApp.cpp src/widgets/MainFrame.cpp src/widgets/EditPane.cpp src/widgets/TabContainer.cpp -ldl build/Tyro.a -L/usr/lib/x86_64-linux-gnu -pthread -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_webview-3.0 -lwx_gtk2u_stc-3.0 -lwx_gtk2u_richtext-3.0 -lwx_gtk2u_ribbon-3.0 -lwx_gtk2u_propgrid-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_gl-3.0 -lwx_gtk2u_media-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_qa-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu_xml-3.0 -lwx_baseu_net-3.0 -lwx_baseu-3.0 -lssh2 -o build/Tyro -/home/twarren/Tyro/src/widgets/EditPane.cpp=/home/twarren/Tyro#-I/usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-3.0 -I/usr/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread src/TyroApp.cpp src/widgets/MainFrame.cpp src/widgets/EditPane.cpp src/widgets/TabContainer.cpp -ldl build/Tyro.a -L/usr/lib/x86_64-linux-gnu -pthread -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_webview-3.0 -lwx_gtk2u_stc-3.0 -lwx_gtk2u_richtext-3.0 -lwx_gtk2u_ribbon-3.0 -lwx_gtk2u_propgrid-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_gl-3.0 -lwx_gtk2u_media-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_qa-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu_xml-3.0 -lwx_baseu_net-3.0 -lwx_baseu-3.0 -lssh2 -o build/Tyro -/home/twarren/Tyro/src/widgets/MainFrame.cpp=/home/twarren/Tyro#-I/usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-3.0 -I/usr/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread src/TyroApp.cpp src/widgets/MainFrame.cpp src/widgets/EditPane.cpp src/widgets/TabContainer.cpp -ldl build/Tyro.a -L/usr/lib/x86_64-linux-gnu -pthread -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_webview-3.0 -lwx_gtk2u_stc-3.0 -lwx_gtk2u_richtext-3.0 -lwx_gtk2u_ribbon-3.0 -lwx_gtk2u_propgrid-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_gl-3.0 -lwx_gtk2u_media-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_qa-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu_xml-3.0 -lwx_baseu_net-3.0 -lwx_baseu-3.0 -lssh2 -o build/Tyro -/home/twarren/Tyro/src/network/SFTP.cpp=/home/twarren/Tyro#-Os -I./src -I./include -fPIC -c -o src/network/SFTP.o src/network/SFTP.cpp -/home/twarren/Tyro/src/TyroApp.cpp=/home/twarren/Tyro#-I/usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-3.0 -I/usr/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread src/TyroApp.cpp src/widgets/MainFrame.cpp src/widgets/EditPane.cpp src/widgets/TabContainer.cpp -ldl build/Tyro.a -L/usr/lib/x86_64-linux-gnu -pthread -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_webview-3.0 -lwx_gtk2u_stc-3.0 -lwx_gtk2u_richtext-3.0 -lwx_gtk2u_ribbon-3.0 -lwx_gtk2u_propgrid-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_gl-3.0 -lwx_gtk2u_media-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_qa-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu_xml-3.0 -lwx_baseu_net-3.0 -lwx_baseu-3.0 -lssh2 -o build/Tyro diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml deleted file mode 100644 index 57395ff..0000000 --- a/nbproject/private/configurations.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - json-forwards.h - json.h - - jsoncpp.cpp - - - - - - - - - - - - - - - - - - - - - - SFTP.cpp - SFTP.h - - - EditPane.cpp - EditPane.h - MainFrame.cpp - MainFrame.h - TabContainer.cpp - TabContainer.h - - TyroApp.cpp - TyroApp.h - common.h - wx_common.h - - - SFTPTest.cpp - catch.hpp - - - - Makefile - - - - localhost - 2 - - - - . - ${AUTO_FOLDER} - - ${AUTO_FOLDER} - - ${MAKE} ${ITEM_NAME}.o - ${AUTO_COMPILE} - - ${AUTO_COMPILE} - - - - - - - - - - - - - - - gdb - - - - "${OUTPUT_PATH}" - - "${OUTPUT_PATH}" - . - false - 0 - 0 - - - - - - diff --git a/nbproject/private/launcher.properties b/nbproject/private/launcher.properties deleted file mode 100644 index 6cc2127..0000000 --- a/nbproject/private/launcher.properties +++ /dev/null @@ -1,40 +0,0 @@ -# Launchers File syntax: -# -# [Must-have property line] -# launcher1.runCommand= -# [Optional extra properties] -# launcher1.displayName= -# launcher1.buildCommand= -# launcher1.runDir= -# launcher1.symbolFiles= -# launcher1.env.= -# (If this value is quoted with ` it is handled as a native command which execution result will become the value) -# [Common launcher properties] -# common.runDir= -# (This value is overwritten by a launcher specific runDir value if the latter exists) -# common.env.= -# (Environment variables from common launcher are merged with launcher specific variables) -# common.symbolFiles= -# (This value is overwritten by a launcher specific symbolFiles value if the latter exists) -# -# In runDir, symbolFiles and env fields you can use these macroses: -# ${PROJECT_DIR} - project directory absolute path -# ${OUTPUT_PATH} - linker output path (relative to project directory path) -# ${OUTPUT_BASENAME}- linker output filename -# ${TESTDIR} - test files directory (relative to project directory path) -# ${OBJECTDIR} - object files directory (relative to project directory path) -# ${CND_DISTDIR} - distribution directory (relative to project directory path) -# ${CND_BUILDDIR} - build directory (relative to project directory path) -# ${CND_PLATFORM} - platform name -# ${CND_CONF} - configuration name -# ${CND_DLIB_EXT} - dynamic library extension -# -# All the project launchers must be listed in the file! -# -# launcher1.runCommand=... -# launcher2.runCommand=... -# ... -# common.runDir=... -# common.env.KEY=VALUE - -# launcher1.runCommand= \ No newline at end of file diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml deleted file mode 100644 index 2f82c81..0000000 --- a/nbproject/private/private.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - true - - - 0 - 0 - - - - - file:/home/twarren/Tyro/README.md - file:/home/twarren/Tyro/Makefile - file:/home/twarren/Tyro/src/network/SFTP.cpp - - -