From: R. Steve McKown Date: Sat, 10 Mar 2012 03:47:19 +0000 (-0700) Subject: Update mplabx files (project name change) X-Git-Url: https://oss.titaniummirror.com/gitweb?p=rgblamp.git;a=commitdiff_plain;h=2ee2bc2a86c8603fca767f4c5363b068fa1b376c Update mplabx files (project name change) --- diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk index 852a2a3..a562b15 100644 --- a/nbproject/Makefile-default.mk +++ b/nbproject/Makefile-default.mk @@ -22,10 +22,10 @@ CP=cp CND_CONF=default ifeq ($(TYPE_IMAGE), DEBUG_RUN) IMAGE_TYPE=debug -FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.cof +FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.cof else IMAGE_TYPE=production -FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.cof +FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.cof endif # Object Directory @@ -70,7 +70,7 @@ MP_AR_DIR="/usr/hitech/picc/9.82/bin" # MP_BC_DIR is not defined .build-conf: ${BUILD_SUBPROJECTS} - ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.cof + ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.cof MP_PROCESSOR_OPTION=16LF1933 # ------------------------------------------------------------------------------------ @@ -248,14 +248,14 @@ endif # ------------------------------------------------------------------------------------ # Rules for buildStep: link ifeq ($(TYPE_IMAGE), DEBUG_RUN) -dist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.cof: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk +dist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.cof: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} - ${MP_LD} $(MP_EXTRA_LD_PRE) -odist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.cof -mdist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.map --summary=default,-psect,-class,+mem,-hex --chip=$(MP_PROCESSOR_OPTION) -P --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 -D__PICCPRO__ -N31 --warn=0 --double=24 --float=24 --addrqual=ignore --mode=lite --output=default,-inhx032 -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" ${OBJECTFILES_QUOTED_IF_SPACED} - @${RM} dist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.hex + ${MP_LD} $(MP_EXTRA_LD_PRE) -odist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.cof -mdist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.map --summary=default,-psect,-class,+mem,-hex --chip=$(MP_PROCESSOR_OPTION) -P --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 -D__PICCPRO__ -N31 --warn=0 --double=24 --float=24 --addrqual=ignore --mode=lite --output=default,-inhx032 -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" ${OBJECTFILES_QUOTED_IF_SPACED} + @${RM} dist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.hex else -dist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.cof: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk +dist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.cof: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} - ${MP_LD} $(MP_EXTRA_LD_PRE) -odist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.cof -mdist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.map --summary=default,-psect,-class,+mem,-hex --chip=$(MP_PROCESSOR_OPTION) -P --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__PICCPRO__ -N31 --warn=0 --double=24 --float=24 --addrqual=ignore --mode=lite --output=default,-inhx032 -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" ${OBJECTFILES_QUOTED_IF_SPACED} + ${MP_LD} $(MP_EXTRA_LD_PRE) -odist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.cof -mdist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.map --summary=default,-psect,-class,+mem,-hex --chip=$(MP_PROCESSOR_OPTION) -P --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__PICCPRO__ -N31 --warn=0 --double=24 --float=24 --addrqual=ignore --mode=lite --output=default,-inhx032 -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" ${OBJECTFILES_QUOTED_IF_SPACED} endif diff --git a/nbproject/Makefile-impl.mk b/nbproject/Makefile-impl.mk index 4fc0029..558cb29 100644 --- a/nbproject/Makefile-impl.mk +++ b/nbproject/Makefile-impl.mk @@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}} # Project Name -PROJECTNAME=picdimmy +PROJECTNAME=rgblamp # Active Configuration DEFAULTCONF=default diff --git a/nbproject/Makefile-variables.mk b/nbproject/Makefile-variables.mk index effa418..7556067 100644 --- a/nbproject/Makefile-variables.mk +++ b/nbproject/Makefile-variables.mk @@ -6,8 +6,8 @@ CND_BASEDIR=`pwd` # default configuration CND_ARTIFACT_DIR_default=dist/default/production -CND_ARTIFACT_NAME_default=picdimmy.production.cof -CND_ARTIFACT_PATH_default=dist/default/production/picdimmy.production.cof +CND_ARTIFACT_NAME_default=rgblamp.production.cof +CND_ARTIFACT_PATH_default=dist/default/production/rgblamp.production.cof CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package -CND_PACKAGE_NAME_default=picdimmy.tar -CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/picdimmy.tar +CND_PACKAGE_NAME_default=rgblamp.tar +CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/rgblamp.tar diff --git a/nbproject/Package-default.bash b/nbproject/Package-default.bash index 22870b1..dc6cecb 100644 --- a/nbproject/Package-default.bash +++ b/nbproject/Package-default.bash @@ -10,9 +10,9 @@ CND_CONF=default CND_DISTDIR=dist TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging TMPDIRNAME=tmp-packaging -OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/picdimmy.${IMAGE_TYPE}.cof -OUTPUT_BASENAME=picdimmy.${IMAGE_TYPE}.cof -PACKAGE_TOP_DIR=picdimmy/ +OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/rgblamp.${IMAGE_TYPE}.cof +OUTPUT_BASENAME=rgblamp.${IMAGE_TYPE}.cof +PACKAGE_TOP_DIR=rgblamp/ # Functions function checkReturnCode @@ -57,15 +57,15 @@ mkdir -p ${TMPDIR} # Copy files and create directories and links cd "${TOP}" -makeDirectory ${TMPDIR}/picdimmy/bin +makeDirectory ${TMPDIR}/rgblamp/bin copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 # Generate tar file cd "${TOP}" -rm -f ${CND_DISTDIR}/${CND_CONF}/package/picdimmy.tar +rm -f ${CND_DISTDIR}/${CND_CONF}/package/rgblamp.tar cd ${TMPDIR} -tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/picdimmy.tar * +tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/rgblamp.tar * checkReturnCode # Cleanup diff --git a/nbproject/project.xml b/nbproject/project.xml index f62232d..023e3ad 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -3,7 +3,7 @@ com.microchip.mplab.nbide.embedded.makeproject - picdimmy + rgblamp edb99ec9-2c71-4461-a761-1abe0aa0f999 0 c