massaging and refactoring all over the place

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@217 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Aug 26, 2008 · 8640769 · 8640769
1 parent 65c4ff1
commit 8640769
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 24 deletions.
diff --git a/topics/fl/csharp1/xsdDotExe.csproj b/topics/fl/csharp1/xsdDotExe.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30428</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{69B31845-4402-41F8-86D9-CC5C62CD727C}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -55,16 +55,16 @@
     <Compile Include="TestIO.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\repository\fac5.xml">
+    <Content Include="..\shared\fac5.xml">
       <Link>fac5.xml</Link>
     </Content>
-    <Content Include="..\..\repository\factorial.xml">
+    <Content Include="..\shared\factorial.xml">
       <Link>factorial.xml</Link>
     </Content>
     <Content Include="README.txt" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\repository\fl.xsd">
+    <None Include="..\xsd\fl.xsd">
       <Link>fl.xsd</Link>
     </None>
     <None Include="Makefile" />

diff --git a/topics/fl/csharp1/xsdDotExe.csproj.user b/topics/fl/csharp1/xsdDotExe.csproj.user
@@ -1,8 +1,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <StartArguments>..\..\..\..\repository\factorial.xml ..\..\temp.txt</StartArguments>
+    <StartArguments>..\shared\factorial.xml temp.txt</StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <StartArguments>..\..\..\..\repository\factorial.xml ..\..\temp.txt</StartArguments>
+    <StartArguments>..\shared\factorial.xml temp.txt</StartArguments>
   </PropertyGroup>
 </Project>
diff --git a/topics/fl/csharp2/linq2xml.csproj b/topics/fl/csharp2/linq2xml.csproj
@@ -50,16 +50,16 @@
     <Compile Include="TestIO.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\repository\fac5.xml">
+    <Content Include="..\shared\fac5.xml">
       <Link>fac5.xml</Link>
     </Content>
-    <Content Include="..\..\repository\factorial.xml">
+    <Content Include="..\shared\factorial.xml">
       <Link>factorial.xml</Link>
     </Content>
     <Content Include="README.txt" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\repository\fl.xsd">
+    <None Include="..\xsd\fl.xsd">
       <Link>fl.xsd</Link>
     </None>
     <None Include="Makefile" />
@@ -72,4 +72,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/topics/fl/csharp2/linq2xml.csproj.user b/topics/fl/csharp2/linq2xml.csproj.user
@@ -1,8 +1,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <StartArguments>..\..\..\..\repository\factorial.xml ..\..\temp.txt</StartArguments>
+    <StartArguments>..\shared\factorial.xml temp.txt</StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <StartArguments>..\..\..\..\repository\factorial.xml ..\..\temp.txt</StartArguments>
+    <StartArguments>..\shared\factorial.xml temp.txt</StartArguments>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/topics/fl/include.mk b/topics/fl/include.mk
@@ -1,10 +1,10 @@
 shared = ../shared
 xsd = ../xsd
 factorial = ${shared}/factorial.txt
-xfactorial =  ${xsd}/factorial.xml
+xfactorial =  ${shared}/factorial.xml
 temp = temp.txt
 schema =  ${xsd}/fl.xsd
 apply = ${shared}/fac5.txt
-xapply = ${xsd}/fac5.xml
+xapply = ${shared}/fac5.xml
 unoptimized = ${shared}/sample88a.txt
 optimized = ${shared}/sample88b.txt
diff --git a/topics/fl/prolog2/Makefile b/topics/fl/prolog2/Makefile
@@ -1,9 +1,7 @@
-root = ../../..
-shared = ${root}/shared
-fl = ..
-tools = ${shared}/tools
-xsd = ${shared}/xsd
-xbgf = ${fl}/lci/xbgf
+include ../include.mk
+
+tools = ../../../shared/tools
+xbgf = ../lci/xbgf
 
 build: limit.bgf limit.btf
 
@@ -18,11 +16,11 @@ append.xbgf:
 		${xbgf}/mkSignature.xbgf
 
 limit.bgf: append.xbgf
-	${tools}/xsd2bgf ${fl}/xsd/fl.xsd source.bgf
+	${tools}/xsd2bgf ${schema} source.bgf
 	${tools}/xbgf append.xbgf source.bgf limit.bgf
 
 limit.btf: append.xbgf
-	${tools}/xml2btf ${fl}/xsd/fl.xsd ${fl}/xsd/factorial.xml source.btf
+	${tools}/xml2btf ${schema} ${xfactorial} source.btf
 	${tools}/xbtf append.xbgf source.btf limit.btf
 
 rebuild:
@@ -40,3 +38,4 @@ clean:
 	rm -f *.bgf
 	rm -f *.btf
 	rm -f *.xbgf
+
diff --git a/topics/fl/xsd/fac5.xml → topics/fl/shared/fac5.xml b/topics/fl/xsd/fac5.xml → topics/fl/shared/fac5.xml
diff --git a/topics/fl/xsd/factorial.xml → topics/fl/shared/factorial.xml b/topics/fl/xsd/factorial.xml → topics/fl/shared/factorial.xml
diff --git a/topics/fl/xsd/Makefile b/topics/fl/xsd/Makefile
@@ -1,5 +1,5 @@
 build:
 
 test:
-	ls -1 *.xml | xargs java -jar ../../../download/msv/msv.jar fl.xsd
+	ls -1 ../shared/*.xml | xargs java -jar ../../../download/msv/msv.jar fl.xsd