Selaa lähdekoodia

Better autotools/Monodevelop integration.

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2933 92316355-f0b4-4df1-b90c-862c8a59935f
remotes/tiles
sam 16 vuotta sitten
vanhempi
commit
345d9dc666
5 muutettua tiedostoa jossa 39 lisäystä ja 7 poistoa
  1. +2
    -2
      ThePimp/Makefile.am
  2. +7
    -3
      ThePimp/ThePimp.mdp
  3. +5
    -1
      libpipi.mds
  4. +7
    -1
      pipi-sharp/pipi-sharp.mdp
  5. +18
    -0
      pipi/libpipi.mdp

+ 2
- 2
ThePimp/Makefile.am Näytä tiedosto

@@ -31,13 +31,13 @@ image_sources = \

if USE_CSHARP
if USE_GTKSHARP
bin_SCRIPTS = Pimp.exe
bin_SCRIPTS = ThePimp.exe
endif
endif

EXTRA_DIST = $(pimp_sources) $(pimp_resources) $(image_sources)

Pimp.exe: ../pipi-sharp/pipi-sharp.dll $(pimp_sources) $(pimp_resources)
ThePimp.exe: ../pipi-sharp/pipi-sharp.dll $(pimp_sources) $(pimp_resources)
cp ../pipi-sharp/pipi-sharp.dll .
cp ../pipi-sharp/pipi-sharp.dll.config .
cp ../pipi-sharp/pipi-sharp.dll.mdb .


+ 7
- 3
ThePimp/ThePimp.mdp Näytä tiedosto

@@ -4,8 +4,10 @@
<CustomCommands>
<Command type="AfterBuild" command="cp ${CombineDir}/pipi-sharp/pipi-sharp.dll.config ${TargetDir}" workingdir="" />
<Command type="AfterBuild" command="cp ${CombineDir}/pipi-sharp/pipi-sharp.dll.mdb ${TargetDir}" />
<Command type="AfterClean" command="rm -f ${TargetDir}/pipi-sharp.dll.config" />
<Command type="AfterClean" command="rm -f ${TargetDir}/pipi-sharp.dll.mdb" />
</CustomCommands>
<Output directory="." assemblyKeyFile="." assembly="Pimp" />
<Output directory="." assemblyKeyFile="." assembly="ThePimp" />
<Build debugmode="True" target="Exe" />
<Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" definesymbols="DEBUG" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
@@ -14,8 +16,10 @@
<CustomCommands>
<Command type="AfterBuild" command="cp ${CombineDir}/pipi-sharp/pipi-sharp.dll.config ${TargetDir}" />
<Command type="AfterBuild" command="cp ${CombineDir}/pipi-sharp/pipi-sharp.dll.mdb ${TargetDir}" />
<Command type="AfterClean" command="rm -f ${TargetDir}/pipi-sharp.dll.config" />
<Command type="AfterClean" command="rm -f ${TargetDir}/pipi-sharp.dll.mdb" />
</CustomCommands>
<Output directory="." assemblyKeyFile="." assembly="Pimp" />
<Output directory="." assemblyKeyFile="." assembly="ThePimp" />
<Build debugmode="False" target="Exe" />
<Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
@@ -63,4 +67,4 @@
<Widget>ThePimp.ToolBox</Widget>
</ExportedWidgets>
</GtkDesignInfo>
</Project>
</Project>

+ 5
- 1
libpipi.mds Näytä tiedosto

@@ -1,20 +1,24 @@
<Combine name="ThePimp" fileversion="2.0">
<Configurations active="Debug">
<Configuration name="Debug" ctype="CombineConfiguration">
<Entry build="True" name="libpipi" configuration="Default" />
<Entry build="True" name="pipi-sharp" configuration="Debug" />
<Entry build="True" name="ThePimp" configuration="Debug" />
</Configuration>
<Configuration name="Release" ctype="CombineConfiguration">
<Entry build="True" name="libpipi" configuration="Default" />
<Entry build="True" name="pipi-sharp" configuration="Release" />
<Entry build="True" name="ThePimp" configuration="Release" />
</Configuration>
</Configurations>
<StartMode startupentry="ThePimp" single="True">
<Execute type="None" entry="libpipi" />
<Execute type="None" entry="pipi-sharp" />
<Execute type="None" entry="ThePimp" />
</StartMode>
<Entries>
<Entry filename="pipi/libpipi.mdp" />
<Entry filename="pipi-sharp/pipi-sharp.mdp" />
<Entry filename="ThePimp/ThePimp.mdp" />
</Entries>
</Combine>
</Combine>

+ 7
- 1
pipi-sharp/pipi-sharp.mdp Näytä tiedosto

@@ -1,12 +1,18 @@
<Project name="pipi-sharp" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="." assembly="pipi-sharp" />
<CustomCommands>
<Command type="AfterBuild" command="sh -c &quot;rm -f pipi-sharp.dll.config &amp;&amp; make pipi-sharp.dll.config&quot;" workingdir="${TargetDir}" />
</CustomCommands>
<Output directory="." assemblyKeyFile="." assembly="pipi-sharp" />
<Build debugmode="True" target="Library" />
<Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
<CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
</Configuration>
<Configuration name="Release" ctype="DotNetProjectConfiguration">
<CustomCommands>
<Command type="AfterBuild" command="sh -c &quot;rm -f pipi-sharp.dll.config &amp;&amp; make pipi-sharp.dll.config&quot;" workingdir="${TargetDir}" />
</CustomCommands>
<Output directory="." assembly="pipi-sharp" />
<Build debugmode="False" target="Library" />
<Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />


+ 18
- 0
pipi/libpipi.mdp Näytä tiedosto

@@ -0,0 +1,18 @@
<Project name="libpipi" fileversion="2.0" ctype="GenericProject">
<Configurations active="Default">
<Configuration name="Default" ctype="GenericProjectConfiguration">
<CustomCommands>
<Command type="BeforeBuild" command="sh -c &quot;test -f configure || ./bootstrap&quot;" workingdir="${CombineDir}" />
<Command type="BeforeBuild" command="sh -c &quot;test -f Makefile || ./configure&quot;" workingdir="${CombineDir}" />
<Command type="BeforeBuild" command="make -C pipi" workingdir="${CombineDir}" />
<Command type="Clean" command="make -C pipi clean" workingdir="${CombineDir}" />
</CustomCommands>
<Output directory="." />
<Build debugmode="True" />
<Execution runwithwarnings="True" consolepause="True" />
</Configuration>
</Configurations>
<Contents>
<File name="pipi.h" subtype="Code" buildaction="Nothing" />
</Contents>
</Project>

Ladataan…
Peruuta
Tallenna