From 9153dd5c0818997d8b12fd0c12d28f64d477c94e Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Wed, 1 Feb 2012 23:54:02 +0000 Subject: [PATCH] Remove all project files from stlink. The project is made with Makefiles, so while the project files provided some convenience to some people, they were not in any way portable or maintained. Removing them also allows other people to keep their own versions without having to deal with shared conflicts. Updated gitignore to reflec this. --- .gitignore | 3 +- .project | 81 ---- nbproject/Package-Default.bash | 75 ---- nbproject/Package-flash.bash | 75 ---- nbproject/configurations.xml | 672 --------------------------------- nbproject/project.xml | 27 -- 6 files changed, 2 insertions(+), 931 deletions(-) delete mode 100644 .project delete mode 100644 nbproject/Package-Default.bash delete mode 100644 nbproject/Package-flash.bash delete mode 100644 nbproject/configurations.xml delete mode 100644 nbproject/project.xml diff --git a/.gitignore b/.gitignore index 8e974b74b..bc2ba52ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -/nbproject/private/ +nbproject +.project *.o *.elf doc/tutorial/*.log diff --git a/.project b/.project deleted file mode 100644 index 12a2f85eb..000000000 --- a/.project +++ /dev/null @@ -1,81 +0,0 @@ - - - stlink - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - ?children? - ?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|\|| - - - ?name? - - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.autoBuildTarget - all - - - org.eclipse.cdt.make.core.buildArguments - - - - org.eclipse.cdt.make.core.buildCommand - make - - - org.eclipse.cdt.make.core.cleanBuildTarget - clean - - - org.eclipse.cdt.make.core.contents - org.eclipse.cdt.make.core.activeConfigSettings - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.fullBuildTarget - all - - - org.eclipse.cdt.make.core.stopOnError - true - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - true - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/nbproject/Package-Default.bash b/nbproject/Package-Default.bash deleted file mode 100644 index f6abfb43c..000000000 --- a/nbproject/Package-Default.bash +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -x - -# -# Generated - do not edit! -# - -# Macros -TOP=`pwd` -CND_PLATFORM=GNU-Linux-x86 -CND_CONF=Default -CND_DISTDIR=dist -CND_BUILDDIR=build -NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging -TMPDIRNAME=tmp-packaging -OUTPUT_PATH=gdbserver/st-util -OUTPUT_BASENAME=st-util -PACKAGE_TOP_DIR=stlink/ - -# Functions -function checkReturnCode -{ - rc=$? - if [ $rc != 0 ] - then - exit $rc - fi -} -function makeDirectory -# $1 directory path -# $2 permission (optional) -{ - mkdir -p "$1" - checkReturnCode - if [ "$2" != "" ] - then - chmod $2 "$1" - checkReturnCode - fi -} -function copyFileToTmpDir -# $1 from-file path -# $2 to-file path -# $3 permission -{ - cp "$1" "$2" - checkReturnCode - if [ "$3" != "" ] - then - chmod $3 "$2" - checkReturnCode - fi -} - -# Setup -cd "${TOP}" -mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package -rm -rf ${NBTMPDIR} -mkdir -p ${NBTMPDIR} - -# Copy files and create directories and links -cd "${TOP}" -makeDirectory "${NBTMPDIR}/stlink/bin" -copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 - - -# Generate tar file -cd "${TOP}" -rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/stlink.tar -cd ${NBTMPDIR} -tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/stlink.tar * -checkReturnCode - -# Cleanup -cd "${TOP}" -rm -rf ${NBTMPDIR} diff --git a/nbproject/Package-flash.bash b/nbproject/Package-flash.bash deleted file mode 100644 index 44fd0fc43..000000000 --- a/nbproject/Package-flash.bash +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -x - -# -# Generated - do not edit! -# - -# Macros -TOP=`pwd` -CND_PLATFORM=GNU-Linux-x86 -CND_CONF=flash -CND_DISTDIR=dist -CND_BUILDDIR=build -NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging -TMPDIRNAME=tmp-packaging -OUTPUT_PATH=MissingOutputInProject -OUTPUT_BASENAME=MissingOutputInProject -PACKAGE_TOP_DIR=stlink/ - -# Functions -function checkReturnCode -{ - rc=$? - if [ $rc != 0 ] - then - exit $rc - fi -} -function makeDirectory -# $1 directory path -# $2 permission (optional) -{ - mkdir -p "$1" - checkReturnCode - if [ "$2" != "" ] - then - chmod $2 "$1" - checkReturnCode - fi -} -function copyFileToTmpDir -# $1 from-file path -# $2 to-file path -# $3 permission -{ - cp "$1" "$2" - checkReturnCode - if [ "$3" != "" ] - then - chmod $3 "$2" - checkReturnCode - fi -} - -# Setup -cd "${TOP}" -mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package -rm -rf ${NBTMPDIR} -mkdir -p ${NBTMPDIR} - -# Copy files and create directories and links -cd "${TOP}" -makeDirectory "${NBTMPDIR}/stlink" -copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 - - -# Generate tar file -cd "${TOP}" -rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/stlink.tar -cd ${NBTMPDIR} -tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/stlink.tar * -checkReturnCode - -# Cleanup -cd "${TOP}" -rm -rf ${NBTMPDIR} diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml deleted file mode 100644 index f1fcd48d1..000000000 --- a/nbproject/configurations.xml +++ /dev/null @@ -1,672 +0,0 @@ - - - - - - - - - - - discover_board.h - main.c - startup_stm32l1xx_md.s - system_stm32l1xx.c - - - discover_board.h - main.c - stm32l_discovery_lcd.c - stm32l_discovery_lcd.h - - - main.c - startup_stm32f10x_md_vl.S - stm32f10x_conf.h - stm32f10x_it.c - stm32f10x_it.h - system_stm32f10x.c - - - main.c - - - discover_board.h - main.c - startup_stm32l1xx_md.s - system_stm32l1xx.c - - - - STM32vldiscovery.c - STM32vldiscovery.h - - - - - - - - stdint.h - - - core_cm3.c - core_cm3.h - - - stm32f10x.h - stm32l1xx.h - system_stm32f10x.h - system_stm32l1xx.h - - - misc.h - stm32f10x_adc.h - stm32f10x_bkp.h - stm32f10x_can.h - stm32f10x_cec.h - stm32f10x_crc.h - stm32f10x_dac.h - stm32f10x_dbgmcu.h - stm32f10x_dma.h - stm32f10x_exti.h - stm32f10x_flash.h - stm32f10x_fsmc.h - stm32f10x_gpio.h - stm32f10x_i2c.h - stm32f10x_iwdg.h - stm32f10x_pwr.h - stm32f10x_rcc.h - stm32f10x_rtc.h - stm32f10x_sdio.h - stm32f10x_spi.h - stm32f10x_tim.h - stm32f10x_usart.h - stm32f10x_wwdg.h - - - misc.h - stm32l1xx_adc.h - stm32l1xx_comp.h - stm32l1xx_crc.h - stm32l1xx_dac.h - stm32l1xx_dbgmcu.h - stm32l1xx_dma.h - stm32l1xx_exti.h - stm32l1xx_flash.h - stm32l1xx_gpio.h - stm32l1xx_i2c.h - stm32l1xx_iwdg.h - stm32l1xx_lcd.h - stm32l1xx_pwr.h - stm32l1xx_rcc.h - stm32l1xx_rtc.h - stm32l1xx_spi.h - stm32l1xx_syscfg.h - stm32l1xx_tim.h - stm32l1xx_usart.h - stm32l1xx_wwdg.h - - - - - misc.c - stm32f10x_adc.c - stm32f10x_bkp.c - stm32f10x_can.c - stm32f10x_cec.c - stm32f10x_crc.c - stm32f10x_dac.c - stm32f10x_dbgmcu.c - stm32f10x_dma.c - stm32f10x_exti.c - stm32f10x_flash.c - stm32f10x_fsmc.c - stm32f10x_gpio.c - stm32f10x_i2c.c - stm32f10x_iwdg.c - stm32f10x_pwr.c - stm32f10x_rcc.c - stm32f10x_rtc.c - stm32f10x_sdio.c - stm32f10x_spi.c - stm32f10x_tim.c - stm32f10x_usart.c - stm32f10x_wwdg.c - - - misc.c - stm32l1xx_adc.c - stm32l1xx_comp.c - stm32l1xx_crc.c - stm32l1xx_dac.c - stm32l1xx_dbgmcu.c - stm32l1xx_dma.c - stm32l1xx_exti.c - stm32l1xx_flash.c - stm32l1xx_flash_ramfunc.c - stm32l1xx_gpio.c - stm32l1xx_i2c.c - stm32l1xx_iwdg.c - stm32l1xx_lcd.c - stm32l1xx_pwr.c - stm32l1xx_rcc.c - stm32l1xx_rtc.c - stm32l1xx_spi.c - stm32l1xx_syscfg.c - stm32l1xx_tim.c - stm32l1xx_usart.c - stm32l1xx_wwdg.c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - main.c - - - gdb-remote.c - gdb-remote.h - gdb-server.c - - - stlink-common.c - stlink-common.h - stlink-sg.c - stlink-sg.h - stlink-usb.c - stlink-usb.h - test_sg.c - test_usb.c - uglylogging.c - uglylogging.h - - - - - stlink-hw.h - - - - - - - - Makefile - - - ^(nbproject)$ - - . - - Makefile - - - - LOCAL_SOURCES - default - - - - . - ${MAKE} -f Makefile - ${MAKE} -f Makefile clean - gdbserver/st-util - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - DEBUG=1 - - - - - - - src - - - CONFIG_USE_LIBUSB=1 - DEBUG - - - - - - - src - - - CONFIG_USE_LIBUSB=1 - - - - - - - . - - - DEBUG=1 - - - - - - - - - LOCAL_SOURCES - default - - - - flash - ${MAKE} -f Makefile - ${MAKE} -f Makefile clean - - - - DEBUG - - - - - - - - - - - - - - - - - - src - - - CONFIG_USE_LIBUSB=1 - - - - - - - src - - - CONFIG_USE_LIBSG=1 - CONFIG_USE_LIBUSB=1 - - - - - - - . - - - - - - - - - - - - - - diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 7526e4b6b..000000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - org.netbeans.modules.cnd.makeproject - - - stlink - c - - h - UTF-8 - - - . - - - - Default - 0 - - - flash - 0 - - - - -