Commit b827c29b authored by charras's avatar charras

solved: eeschema, small problem with fields selections in BOM generation

parent 9131e2a1
...@@ -94,17 +94,6 @@ void ReAnnotatePowerSymbolsOnly( void ) ...@@ -94,17 +94,6 @@ void ReAnnotatePowerSymbolsOnly( void )
} }
CmpListStruct* AllocateCmpListStrct( int numcomponents )
{
int ii = numcomponents * sizeof(CmpListStruct);
//allocate memory and fill this memory with zeros.
CmpListStruct* list = (CmpListStruct*) MyZMalloc( ii );
return list;
}
/* qsort function to annotate items by their position. /* qsort function to annotate items by their position.
* Components are sorted * Components are sorted
* by reference * by reference
...@@ -296,7 +285,7 @@ void AnnotateComponents( WinEDA_SchematicFrame* parent, ...@@ -296,7 +285,7 @@ void AnnotateComponents( WinEDA_SchematicFrame* parent,
if( NbOfCmp == 0 ) if( NbOfCmp == 0 )
return; return;
BaseListeCmp = AllocateCmpListStrct( NbOfCmp ); BaseListeCmp = (CmpListStruct*) MyZMalloc( NbOfCmp * sizeof(CmpListStruct) );
/* Second pass : Init data tables */ /* Second pass : Init data tables */
if( annotateSchematic ) if( annotateSchematic )
...@@ -712,7 +701,7 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool oneSheetOnly ) ...@@ -712,7 +701,7 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool oneSheetOnly )
/* Second pass : create the list of components */ /* Second pass : create the list of components */
ListeCmp = AllocateCmpListStrct( NbOfCmp ); ListeCmp = (CmpListStruct*) MyZMalloc( NbOfCmp * sizeof(CmpListStruct) );
if( !oneSheetOnly ) if( !oneSheetOnly )
{ {
......
This diff is collapsed.
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
; General Product Description Definitions ; General Product Description Definitions
!define PRODUCT_NAME "KiCad" !define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "2008.01.25" !define PRODUCT_VERSION "2008.06.15"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/" !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define COMPANY_NAME "" !define COMPANY_NAME ""
!define TRADE_MARKS "" !define TRADE_MARKS ""
...@@ -118,8 +118,8 @@ Section $(TITLE_SEC01) SEC01 ...@@ -118,8 +118,8 @@ Section $(TITLE_SEC01) SEC01
File /nonfatal "..\doc_conv_orcad_to_kicad_spanish.txt" File /nonfatal "..\doc_conv_orcad_to_kicad_spanish.txt"
SetOutPath "$INSTDIR\template" SetOutPath "$INSTDIR\template"
File /nonfatal /r "..\template\*" File /nonfatal /r "..\template\*"
SetOutPath "$INSTDIR\winexe" SetOutPath "$INSTDIR\bin"
File /r "..\winexe\*" File /r "..\bin\*"
SetOutPath "$INSTDIR\internat" SetOutPath "$INSTDIR\internat"
File /r "..\internat\*" File /r "..\internat\*"
SectionEnd SectionEnd
...@@ -156,9 +156,9 @@ Section -CreateShortcuts ...@@ -156,9 +156,9 @@ Section -CreateShortcuts
CreateShortCut "$SMPROGRAMS\KiCad\Home Page.lnk" "$INSTDIR\HomePage.url" CreateShortCut "$SMPROGRAMS\KiCad\Home Page.lnk" "$INSTDIR\HomePage.url"
CreateShortCut "$SMPROGRAMS\KiCad\User Group.lnk" "$INSTDIR\UserGroup.url" CreateShortCut "$SMPROGRAMS\KiCad\User Group.lnk" "$INSTDIR\UserGroup.url"
CreateShortCut "$SMPROGRAMS\KiCad\Uninstall.lnk" "$INSTDIR\uninstaller.exe" CreateShortCut "$SMPROGRAMS\KiCad\Uninstall.lnk" "$INSTDIR\uninstaller.exe"
CreateShortCut "$SMPROGRAMS\KiCad\KiCad.lnk" "$INSTDIR\winexe\kicad.exe" CreateShortCut "$SMPROGRAMS\KiCad\KiCad.lnk" "$INSTDIR\bin\kicad.exe"
CreateShortCut "$SMPROGRAMS\KiCad\Wings3D.lnk" "$INSTDIR\Wings3D.url" CreateShortCut "$SMPROGRAMS\KiCad\Wings3D.lnk" "$INSTDIR\Wings3D.url"
CreateShortCut "$DESKTOP\KiCad.lnk" "$INSTDIR\winexe\kicad.exe" CreateShortCut "$DESKTOP\KiCad.lnk" "$INSTDIR\bin\kicad.exe"
SectionEnd SectionEnd
Section -CreateAddRemoveEntry Section -CreateAddRemoveEntry
...@@ -167,7 +167,7 @@ Section -CreateAddRemoveEntry ...@@ -167,7 +167,7 @@ Section -CreateAddRemoveEntry
WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "Publisher" "${COMPANY_NAME}" WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "Publisher" "${COMPANY_NAME}"
WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninstaller.exe" WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninstaller.exe"
WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\winexe\kicad.exe" WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\bin\kicad.exe"
WriteRegDWORD ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "NoModify" "1" WriteRegDWORD ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "NoModify" "1"
WriteRegDWORD ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "NoRepair" "1" WriteRegDWORD ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "NoRepair" "1"
WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "Comments" "${COMMENTS}" WriteRegStr ${UNINST_ROOT} "${PRODUCT_UNINST_KEY}" "Comments" "${COMMENTS}"
...@@ -221,7 +221,7 @@ Section Uninstall ...@@ -221,7 +221,7 @@ Section Uninstall
RMDir /r "$INSTDIR\library" RMDir /r "$INSTDIR\library"
RMDir /r "$INSTDIR\modules" RMDir /r "$INSTDIR\modules"
RMDir /r "$INSTDIR\template" RMDir /r "$INSTDIR\template"
RMDir /r "$INSTDIR\winexe" RMDir /r "$INSTDIR\bin"
RMDir /r "$INSTDIR\internat" RMDir /r "$INSTDIR\internat"
RMDir /r "$INSTDIR\demos" RMDir /r "$INSTDIR\demos"
RMDir /r "$INSTDIR\tutorial" RMDir /r "$INSTDIR\tutorial"
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment