Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit 15e03d1

Browse files
smaillet-mssmaillet-ms
committed
Merge pull request #151 from smaillet-ms/Support-GCC
fixed generation of DAT and NMF files
2 parents 01a1881 + 06409a3 commit 15e03d1

File tree

6 files changed

+35
-33
lines changed

6 files changed

+35
-33
lines changed

Solutions/MCBSTM32F400/TinyCLR_NONET/GNU_S/tinyclr_dat.s renamed to Solutions/MCBSTM32F400/TinyCLR_NONET/GNU_S/tinyclr_nonet_dat.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.global TinyClr_Dat_End
1010

1111
TinyClr_Dat_Start:
12-
.incbin "tinyclr.dat"
12+
.incbin "tinyclr_nonet.dat"
1313
TinyClr_Dat_End:
1414

1515
.end

Solutions/MCBSTM32F400/TinyCLR_NONET/RVD_S/tinyclr_dat.s renamed to Solutions/MCBSTM32F400/TinyCLR_NONET/RVD_S/tinyclr_nonet_dat.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
EXPORT TinyClr_Dat_End
1616

1717
TinyClr_Dat_Start DATA
18-
INCBIN tinyclr.dat
18+
INCBIN tinyclr_nonet.dat
1919
TinyClr_Dat_End
2020

2121
END

‎Solutions/MCBSTM32F400/TinyCLR_NONET/TinyCLR_NONET.proj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,24 @@
2626
<ImageLocation Condition="'$(MEMORY)'=='FLASH'">\ER_FLASH</ImageLocation>
2727
<LINK_FLAGS Condition="'$(COMPILER_TOOL)'!='GCC'">$(LINK_FLAGS) --verbose $(SWTC)keep *(.init_array)</LINK_FLAGS>
2828
<MMP_DAT_SKIP>false</MMP_DAT_SKIP>
29-
<MMP_DAT_CreateDatabaseFile>$(BIN_DIR)\tinyclr.dat</MMP_DAT_CreateDatabaseFile>
29+
<MMP_DAT_CreateDatabaseFile>$(BIN_DIR)\tinyclr_nonet.dat</MMP_DAT_CreateDatabaseFile>
3030
<EXEScatterFileDefinition>$(SRC_DIR)\scatterfile_tinyclr_$(COMPILER_TOOL).$(SCATTER_EXT)</EXEScatterFileDefinition>
3131
<CompressImageFlashSym>EntryPoint</CompressImageFlashSym>
3232
<CompressImageDatSym>TinyClr_Dat_Start</CompressImageDatSym>
3333
<CompressImageCfgSym>g_ConfigurationSector</CompressImageCfgSym>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<CompressImageSymdef Include="$(BIN_DIR)\TinyCLR.symdefs" />
37-
<CompressImageFlash Include="$(BIN_DIR)\TinyCLR.bin\ER_FLASH" />
38-
<CompressImageDat Include="$(BIN_DIR)\TinyCLR.bin\ER_DAT" />
39-
<CompressImageCfg Include="$(BIN_DIR)\TinyCLR.bin\ER_CONFIG" />
36+
<CompressImageSymdef Include="$(BIN_DIR)\TinyCLR_NONET.symdefs" />
37+
<CompressImageFlash Include="$(BIN_DIR)\TinyCLR_NONET.bin\ER_FLASH" />
38+
<CompressImageDat Include="$(BIN_DIR)\TinyCLR_NONET.bin\ER_DAT" />
39+
<CompressImageCfg Include="$(BIN_DIR)\TinyCLR_NONET.bin\ER_CONFIG" />
4040
</ItemGroup>
4141
<ItemGroup>
4242
<IncludePaths Include="DeviceCode\PAL" />
4343
<Compile Include="allocator.cpp" />
4444
<Compile Include="tinyclr.cpp" />
4545
<HFiles Include="$(SPOCLIENT)\clr\include\tinyclr_application.h" />
46-
<ObjFiles Include="$(OBJ_DIR)\tinyclr_dat.$(OBJ_EXT)" />
46+
<ObjFiles Include="$(OBJ_DIR)\tinyclr_nonet_dat.$(OBJ_EXT)" />
4747
<ScatterFileReferences Include="$(SRC_DIR)\scatterfile_tinyclr_$(COMPILER_TOOL).$(SCATTER_EXT)" />
4848
</ItemGroup>
4949
<Import Condition="'$(CORE_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\core.featureproj" />

‎tools/Targets/Microsoft.SPOT.System.Targets‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,14 +380,14 @@
380380

381381
</Target>
382382

383-
<Target Name="CompressImage" Inputs="@(CompressImageFlash);@(CompressImageDat);@(CompressImageCfg);@(CompressImageSymdef)" Outputs="$(BIN_DIR)\TinyCLR.nmf')" Condition="'$(MEMORY)'!='RAM'" >
383+
<Target Name="CompressImage" Inputs="@(CompressImageFlash);@(CompressImageDat);@(CompressImageCfg);@(CompressImageSymdef)" Outputs="$(BIN_DIR)\$(EXEName).nmf')" Condition="'$(MEMORY)'!='RAM'" >
384384
<Message Text="Compressing @(CompressImages)"/>
385385
<Exec Command="$(TOOLS_DIR)\buildhelper -symdef @(CompressImageSymdef->'%(RootDir)%(Directory)%(FileName).symdefs') $(CompressImageFlashSym) -compress @(CompressImageFlash) @(CompressImageFlash->'%(RootDir)%(Directory)%(FileName).nmf')"/>
386386
<Exec Command="$(TOOLS_DIR)\buildhelper -symdef @(CompressImageSymdef->'%(RootDir)%(Directory)%(FileName).symdefs') $(CompressImageDatSym) -compress @(CompressImageDat) @(CompressImageDat->'%(RootDir)%(Directory)%(FileName).nmf')" Condition="EXISTS('@(CompressImageDat)')"/>
387387
<Exec Command="$(TOOLS_DIR)\buildhelper -symdef @(CompressImageSymdef->'%(RootDir)%(Directory)%(FileName).symdefs') $(CompressImageCfgSym) -compress @(CompressImageCfg) @(CompressImageCfg->'%(RootDir)%(Directory)%(FileName).nmf')"/>
388388

389-
<Exec Command="Copy /b @(CompressImageFlash->'%(RootDir)%(Directory)%(FileName).nmf') + @(CompressImageDat->'%(RootDir)%(Directory)%(FileName).nmf') + @(CompressImageCfg->'%(RootDir)%(Directory)%(FileName).nmf') $(BIN_DIR)\TinyCLR.nmf" Condition="EXISTS('@(CompressImageDat)')"/>
390-
<Exec Command="Copy /b @(CompressImageFlash->'%(RootDir)%(Directory)%(FileName).nmf') + @(CompressImageCfg->'%(RootDir)%(Directory)%(FileName).nmf') $(BIN_DIR)\TinyCLR.nmf" Condition="!EXISTS('@(CompressImageDat)')"/>
389+
<Exec Command="Copy /b @(CompressImageFlash->'%(RootDir)%(Directory)%(FileName).nmf') + @(CompressImageDat->'%(RootDir)%(Directory)%(FileName).nmf') + @(CompressImageCfg->'%(RootDir)%(Directory)%(FileName).nmf') $(BIN_DIR)\$(AssemblyName).nmf" Condition="EXISTS('@(CompressImageDat)')"/>
390+
<Exec Command="Copy /b @(CompressImageFlash->'%(RootDir)%(Directory)%(FileName).nmf') + @(CompressImageCfg->'%(RootDir)%(Directory)%(FileName).nmf') $(BIN_DIR)\$(AssemblyName).nmf" Condition="!EXISTS('@(CompressImageDat)')"/>
391391
</Target>
392392

393393
<PropertyGroup>
@@ -410,6 +410,8 @@
410410
<Message Text=" platform imxs|mote2|etc. target platform to compile"/>
411411
<Message Text=" memory flash|ram target memory device for the binaries"/>
412412
<Message Text=" flavor debug|release|rtm target build flavor"/>
413+
<Message Text=" "/>
414+
<Message Text="Targets used by the MF Build System:" Importance="high"/>
413415
<Message Text=" build Invoke the build target, which builds the platform specified." />
414416
<Message Text=" This is the default target if no target is specified on the"/>
415417
<Message Text=" command line."/>

‎tools/Targets/Microsoft.Spot.system.gcc.targets‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -372,18 +372,18 @@
372372
/>
373373
</Target>
374374

375-
<Target Name="TinyClrDat" Inputs="$(BIN_DIR)\tinyclr.dat;$(AS_SUBDIR)\tinyclr_dat.s" Outputs="$(OBJ_DIR)\tinyclr_dat.$(OBJ_EXT)">
375+
<Target Name="TinyClrDat" Inputs="$(BIN_DIR)\$(AssemblyName).dat;$(AS_SUBDIR)\$(AssemblyName)_dat.s" Outputs="$(OBJ_DIR)\$(AssemblyName)_dat.$(OBJ_EXT)">
376376
<Message Text="***************************************************************************************************"/>
377-
<Message Text="Target: TinyClrDat with outputs $(OBJ_DIR)\tinyclr_dat.$(OBJ_EXT)"/>
378-
<Message Condition="'$(FORCEDAT)'!=''" Text="Building Tinyclr.dat from $(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\tinyclr_$(FORCEDAT).dat"/>
379-
<Message Condition="'$(FORCEDAT)'==''" Text="Building Tinyclr.dat from the features specified in the tinyclr.proj file"/>
380-
<Exec Condition="'$(FORCEDAT)'!='' AND EXISTS('$(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\tinyclr_$(FORCEDAT).dat')" Command="copy /y $(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\tinyclr_$(FORCEDAT).dat $(BIN_DIR)\tinyclr.dat" />
381-
<Exec Command="$(AS) -I$(BIN_DIR) $(AS_FLAGS) -a=$(OBJ_DIR)\tinyclr_dat.txt -o $(OBJ_DIR)\tinyclr_dat.$(OBJ_EXT) $(AS_SUBDIR)\tinyclr_dat.s"/>
377+
<Message Text="Target: TinyClrDat with outputs $(OBJ_DIR)\$(AssemblyName)_dat.$(OBJ_EXT)"/>
378+
<Message Condition="'$(FORCEDAT)'!=''" Text="Building $(AssemblyName).dat from $(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\$(AssemblyName)_$(FORCEDAT).dat"/>
379+
<Message Condition="'$(FORCEDAT)'==''" Text="Building $(AssemblyName).dat from the features specified in the $(AssemblyName).proj file"/>
380+
<Exec Condition="'$(FORCEDAT)'!='' AND EXISTS('$(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\$(AssemblyName)_$(FORCEDAT).dat')" Command="copy /y $(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\$(AssemblyName)_$(FORCEDAT).dat $(BIN_DIR)\$(AssemblyName).dat" />
381+
<Exec Command="$(AS) -I$(BIN_DIR) $(AS_FLAGS) -a=$(OBJ_DIR)\$(AssemblyName)_dat.txt -o $(OBJ_DIR)\$(AssemblyName)_dat.$(OBJ_EXT) $(AS_SUBDIR)\$(AssemblyName)_dat.s"/>
382382
<Message Text="========== Database file content:"/>
383-
<Exec Command="$(PRG_MMP) -dump_dat $(BIN_DIR)\tinyclr.dat" />
383+
<Exec Command="$(PRG_MMP) -dump_dat $(BIN_DIR)\$(AssemblyName).dat" />
384384
<Message Text="========== End of Database file content"/>
385385
<Message Text="***************************************************************************************************"/>
386-
<Exec Command="copy /BVY $(BIN_DIR)\tinyclr.dat $(BIN_DIR)\tinyclr.dat.fromlastbuildrun" />
387-
<Exec Command="del /Q /F $(BIN_DIR)\tinyclr.dat"/>
386+
<Exec Command="copy /BVY $(BIN_DIR)\$(AssemblyName).dat $(BIN_DIR)\$(AssemblyName).dat.fromlastbuildrun" />
387+
<Exec Command="del /Q /F $(BIN_DIR)\$(AssemblyName).dat"/>
388388
</Target>
389389
</Project>

‎tools/Targets/Microsoft.Spot.system.mdk.targets‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -397,25 +397,25 @@
397397
<Target Name="BuildScatterfile" Condition="'$(DEPEND)'!='ACTIVE'" Inputs="@(EXEScatterFileDefinition);@(ScatterFileReferences)" Outputs="@(EXEScatterFile)">
398398
<Message Text="..."/>
399399
<ProcessScatterFile
400-
Properties="@(BuildScatterFileProperties)"
401-
DefinitionFile="@(EXEScatterfileDefinition)"
402-
OutputFile="@(EXEScatterFile)"
403-
/>
400+
Properties="@(BuildScatterFileProperties)"
401+
DefinitionFile="@(EXEScatterfileDefinition)"
402+
OutputFile="@(EXEScatterFile)"
403+
/>
404404
</Target>
405405

406-
<Target Name="TinyClrDat" Inputs="$(BIN_DIR)\tinyclr.dat;$(AS_SUBDIR)\tinyclr_dat.s" Outputs="$(OBJ_DIR)\tinyclr_dat.$(OBJ_EXT)">
406+
<Target Name="TinyClrDat" Inputs="$(BIN_DIR)\$(AssemblyName).dat;$(AS_SUBDIR)\$(AssemblyName)_dat.s" Outputs="$(OBJ_DIR)\$(AssemblyName)_dat.$(OBJ_EXT)">
407407
<Message Text="***************************************************************************************************"/>
408-
<Message Text="Target: TinyClrDat with outputs $(OBJ_DIR)\tinyclr_dat.$(OBJ_EXT)"/>
409-
<Message Condition="'$(FORCEDAT)'!=''" Text="Building Tinyclr.dat from $(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\tinyclr_$(FORCEDAT).dat"/>
410-
<Message Condition="'$(FORCEDAT)'==''" Text="Building Tinyclr.dat from the features specified in the tinyclr.proj file"/>
411-
<Exec Condition="'$(FORCEDAT)'!='' AND EXISTS('$(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\tinyclr_$(FORCEDAT).dat')" Command="copy /y $(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\tinyclr_$(FORCEDAT).dat $(BIN_DIR)\tinyclr.dat" />
412-
<Exec Command="$(ADS_WRAPPER) $(AS) -I$(BIN_DIR) $(AS_FLAGS) $(POS_DEPENDENT) $(SWTC)LIST $(OBJ_DIR)\tinyclr_dat.txt $(SWTC)xref -o $(OBJ_DIR)\tinyclr_dat.$(OBJ_EXT) $(AS_SUBDIR)\tinyclr_dat.s"/>
408+
<Message Text="Target: TinyClrDat with outputs $(OBJ_DIR)\$(AssemblyName)_dat.$(OBJ_EXT)"/>
409+
<Message Condition="'$(FORCEDAT)'!=''" Text="Building $(AssemblyName).dat from $(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\$(AssemblyName)_$(FORCEDAT).dat"/>
410+
<Message Condition="'$(FORCEDAT)'==''" Text="Building $(AssemblyName).dat from the features specified in the $(AssemblyName).proj file"/>
411+
<Exec Condition="'$(FORCEDAT)'!='' AND EXISTS('$(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\$(AssemblyName)_$(FORCEDAT).dat')" Command="copy /y $(BUILD_TREE_CLIENT)\dat\$(ENDIANNESS)\$(AssemblyName)_$(FORCEDAT).dat $(BIN_DIR)\$(AssemblyName).dat" />
412+
<Exec Command="$(ADS_WRAPPER) $(AS) -I$(BIN_DIR) $(AS_FLAGS) $(POS_DEPENDENT) $(SWTC)LIST $(OBJ_DIR)\$(AssemblyName)_dat.txt $(SWTC)xref -o $(OBJ_DIR)\$(AssemblyName)_dat.$(OBJ_EXT) $(AS_SUBDIR)\$(AssemblyName)_dat.s"/>
413413
<Message Text="========== Database file content:"/>
414-
<Exec Command="$(PRG_MMP) -dump_dat $(BIN_DIR)\tinyclr.dat" />
414+
<Exec Command="$(PRG_MMP) -dump_dat $(BIN_DIR)\$(AssemblyName).dat" />
415415
<Message Text="========== End of Database file content"/>
416416
<Message Text="***************************************************************************************************"/>
417-
<Exec Command="copy /BVY $(BIN_DIR)\tinyclr.dat $(BIN_DIR)\tinyclr.dat.fromlastbuildrun" />
418-
<Exec Command="del /Q /F $(BIN_DIR)\tinyclr.dat"/>
417+
<Exec Command="copy /BVY $(BIN_DIR)\$(AssemblyName).dat $(BIN_DIR)\$(AssemblyName).dat.fromlastbuildrun" />
418+
<Exec Command="del /Q /F $(BIN_DIR)\$(AssemblyName).dat"/>
419419
</Target>
420420

421421
</Project>

0 commit comments

Comments
 (0)