1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229
|
Index: libaws-2.2/demos/demos.gpr
===================================================================
--- libaws-2.2.orig/demos/demos.gpr 2006-07-30 12:58:20.000000000 +0200
+++ libaws-2.2/demos/demos.gpr 2006-07-30 12:58:31.000000000 +0200
@@ -1,117 +1,38 @@
-------------------------------------------------------------------------------
--- Ada Web Server --
--- --
--- Copyright (C) 2003-2005 --
--- AdaCore --
--- --
--- Authors: Dmitriy Anisimkov - Pascal Obry --
--- --
--- This library is free software; you can redistribute it and/or modify --
--- it under the terms of the GNU General Public License as published by --
--- the Free Software Foundation; either version 2 of the License, or (at --
--- your option) any later version. --
--- --
--- This library is distributed in the hope that it will be useful, but --
--- WITHOUT ANY WARRANTY; without even the implied warranty of --
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --
--- General Public License for more details. --
--- --
--- You should have received a copy of the GNU General Public License --
--- along with this library; if not, write to the Free Software Foundation, --
--- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --
--- --
-------------------------------------------------------------------------------
-
-with "../shared";
-with "../include/include";
-with "../src/src";
-with "../win32/win32";
-with "demos_shared";
-
+-- Ada Web server - project file to build the examples
+-- Copyright (c) 2004 Ludovic Brenta <ludovic.brenta@insalien.org>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should normally copy the examples directory to a user-writable
+-- directory before trying to compile.
+with "aws.gpr";
+with "xmlada2.gpr";
project Demos is
-
- for Languages use ("Ada", "Project file");
-
- Mains := ("hello_world.adb", "com_1.adb", "com_2.adb", "main.adb",
- "hotplug.adb", "dispatch.adb", "wps.adb", "ws.adb",
- "auth.adb", "text_input.adb", "vh_demo.adb", "res_demo.adb",
- "zdemo.adb", "split.adb", "web_mail.adb", "web_elements.adb",
- "web_elements_containers.ads", "web_elements_containers.adb");
-
- Mains_XMLAda := ("soap_client.adb", "soap_server.adb", "soap_svs.adb",
- "soap_cvs.adb", "wsdl_demo_client.adb",
- "wsdl_demo_server.adb", "interoplab_main.adb",
- "soap_server_disp.adb", "test_jabber.adb");
-
- for Source_Files use
- Mains & ("dispatch_cb.adb", "auth_cb.adb", "text_input_cb.adb",
- "vh_demo_cb.adb", "ws_cb.adb", "zdemo_cb.adb", "rdemo.adb",
- "hotplug_cb.adb", "hello_world_cb.adb", "res_demo_cb.adb",
- "rdemo-adains_png.ads", "rdemo-page3_html.ads", "demos.gpr");
-
- for Main use Mains;
-
- case Shared.XMLAda is
- when "Installed" =>
- for Main use project'Main & Mains_XMLAda;
- for Source_Files use
- project'Source_Files
- & Mains_XMLADA
- & ("hello_demo.ads", "hello_demo-client.adb",
- "hello_demo-server.adb", "hello_demo-types.ads",
- "wsdl_demo_server_cb.adb", "interoplab.ads",
- "interoplab-client.adb", "interoplab-types.ads",
- "soap_server_cb.adb", "soap_server_disp_cb.adb",
- "soap_svs_cb.adb", "soap_svs_cb.adb",
- "soapinterop-org-xsd-arrayoffloat_type_pkg.ads",
- "soapinterop-org-xsd-arrayofint_type_pkg.ads",
- "soapinterop-org-xsd-arrayofsoapstruct_type_pkg.ads",
- "soapinterop-org-xsd-arrayofstring_type_pkg.ads",
- "soapinterop-org-xsd-soapstruct_type_pkg.adb",
- "soapinterop-org-xsd-soapstruct_type_pkg.ads",
- "soapinterop-org-xsd.ads",
- "soapinterop-org.ads", "soapinterop.ads");
- when "Disabled" =>
- null;
- end case;
-
- case Shared.Build is
- when "Debug" =>
- for Object_Dir use "../.build/debug/demos/obj";
- for Exec_Dir use "../.build/debug/demos";
- when "Release" =>
- for Object_Dir use "../.build/release/demos/obj";
- for Exec_Dir use "../.build/release/demos";
- end case;
-
- ---------
- -- Ide --
- ---------
-
- package Ide renames Shared.Ide;
-
- ------------
- -- Binder --
- ------------
-
- package Binder renames Shared.Binder;
-
- -------------
- -- Builder --
- -------------
-
- package Builder renames Shared.Builder;
-
- --------------
- -- Compiler --
- --------------
-
- package Compiler renames Demos_Shared.Compiler;
-
- ------------
- -- Linker --
- ------------
-
- package Linker renames Demos_Shared.Linker;
-
+ for Source_Dirs use (".");
+ for Object_Dir use "obj";
+ for Exec_Dir use ".";
+
+ for Main use ("runme", "agent", "auth", "ws", "wps", "com_1", "com_2",
+ "main", "hotplug", "hello_world", "text_input", "vh_demo",
+ "dispatch", "res_demo", "zdemo", "split", "web_mail",
+ "test_jabber", "soap_client", "soap_server", "soap_svs",
+ "soap_cvs", "wsdl_demo_client", "wsdl_demo_server",
+ "interoplab_main", "soap_server_disp");
+
+ package Compiler is
+ for Default_Switches ("Ada") use ("-g", "-gnatafoy", "-gnatVa");
+ end Compiler;
+
+ package Linker is
+ for Default_Switches ("Ada") use (AWS.Linker_Switches,
+ XMLAda2.Linker_Switches);
+ end Linker;
end Demos;
Index: libaws-2.2/demos/makefile
===================================================================
--- libaws-2.2.orig/demos/makefile 2006-07-30 13:02:35.000000000 +0200
+++ libaws-2.2/demos/makefile 2006-07-30 13:02:43.000000000 +0200
@@ -1,29 +1,40 @@
+# AWS examples makefile
+# Copyright (c) 2004 Ludovic Brenta <ludovic.brenta@insalien.org>
-build_res:
- echo Generate resources for res_demo
- $(AWSRES) -q -r rdemo adains.png page3.html
-
-build_wsdl:
- echo Generate stub/skel from WSDL documents
- $(WSDL2AWS) -q -f -doc hello.wsdl
- $(WSDL2AWS) -q -f -doc -noskel interoplab_main.wsdl
-
-force:
-
-AWSRES = ../$(BDIR)/tools/awsres
-WSDL2AWS = ../$(BDIR)/tools/wsdl2aws
-
-ifeq (${PRJ_XMLADA}, Installed)
-BUILD_EXT = build_wsdl
-endif
-
-setup:
- -$(MKDIR) -p ../$(BDIR)/demos/obj
-
-build: build_res $(BUILD_EXT)
- $(GNATMAKE) -Pdemos -XBuild=${PRJ_BUILD} -XXMLADA=${PRJ_XMLADA}
- $(GNATMAKE) -Pdemos_ssl -XSOCKET=${SOCKET} \
- -XBuild=${PRJ_BUILD} -XXMLADA=${PRJ_XMLADA}
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should normally copy the examples directory to a user-writable
+# directory before trying to compile.
+
+# This Makefile builds all the Ada Web Server examples, using the
+# Debian way of organising files. In particular, it uses project
+# files to do most of the work, instead of specifying dependencies
+# explicitly.
+
+.SUFFIXES=
+
+all: obj rdemo.ads hello_demo.ads interoplab.ads
+ gnatmake -Pdemos
+
+rdemo.ads: adains.png page3.html
+ awsres -q -r rdemo $<
+
+hello_demo.ads: hello.wsdl
+ wsdl2aws -q -f -doc $<
+
+interoplab.ads: interoplab_main.wsdl
+ wsdl2aws -q -f -doc -noskel $<
+
+obj:
+ mkdir -p obj
clean:
- $(RM) -fr ../$(BDIR)/demos
+ rm -rf obj rdemo.ads hello_demo* interoplab-* interoplab.ads
|