[Gd-chatter] r10750 - in trunk/fundev: admin/builds sources/environment/reports sources/environment/tools sources/lib/licensing
housel at gwydiondylan.org
housel at gwydiondylan.org
Tue May 23 07:29:00 CEST 2006
Author: housel
Date: Tue May 23 07:28:57 2006
New Revision: 10750
Removed:
trunk/fundev/sources/lib/licensing/
Modified:
trunk/fundev/admin/builds/Makefile
trunk/fundev/sources/environment/reports/bug-report.dylan
trunk/fundev/sources/environment/reports/library.dylan
trunk/fundev/sources/environment/reports/module.dylan
trunk/fundev/sources/environment/tools/help.dylan
trunk/fundev/sources/environment/tools/initialization.dylan
trunk/fundev/sources/environment/tools/library.dylan
trunk/fundev/sources/environment/tools/module.dylan
Log:
Bug: 6986
Remove the licensing library, all references to it, and the product
registration functionality.
Modified: trunk/fundev/admin/builds/Makefile
==============================================================================
--- trunk/fundev/admin/builds/Makefile (original)
+++ trunk/fundev/admin/builds/Makefile Tue May 23 07:28:57 2006
@@ -222,7 +222,6 @@
INSTALL_LIB_SOURCE = $(INSTALL_SOURCE)\x86-win32\lib
INSTALL_BIN_SOURCE = $(INSTALL_SOURCE)\x86-win32\bin
IO_TESTS_SOURCE = $(IO_DIRECTORY)\tests
-LICENSING_SOURCE = $(LIB_DIRECTORY)\licensing
LIFE_SOURCE = $(DUIM_EXAMPLES_SOURCE)\life
LIFE_INSTALL_DIRECTORY = $(DUIM_EXAMPLES_INSTALL_DIRECTORY)\life
MAP_STATISTICS_SOURCE = $(TOOLS_DIRECTORY)\map-statistics
@@ -570,7 +569,6 @@
ELF_LINKER = $(INSTALL_BIN_DIRECTORY)\elf-linker.dll
HD2C_DFMC_SHELL = $(INSTALL_BIN_DIRECTORY)\hd2c-dfmc-shell.dll
INTERPRETER_DFMC_SHELL = $(INSTALL_BIN_DIRECTORY)\interpreter-dfmc-shell.dll
-LICENSING = $(INSTALL_BIN_DIRECTORY)\licensing.dll
METERING = $(INSTALL_BIN_DIRECTORY)\metering.dll
MOTLEY = $(INSTALL_BIN_DIRECTORY)\motley.dll
RELEASE_INFO = $(INSTALL_BIN_DIRECTORY)\release-info.dll
@@ -806,7 +804,6 @@
elf-linker: $(ELF_LINKER)
hd2c-dfmc-shell: $(HD2C_DFMC_SHELL)
interpreter-dfmc-shell: $(INTERPRETER_DFMC_SHELL)
-licensing: $(LICENSING)
metering: $(METERING)
motley: $(MOTLEY)
release-info: $(RELEASE_INFO)
@@ -848,7 +845,7 @@
test-report: $(TEST_REPORT)
project-manager-libraries: tools-interface user-projects
-core-compiler-libraries: file-source-records release-info dood metering binary-manager coff-manager binary-builder coff-builder build-system parser-run-time dfmc-management dfmc-browser-support project-manager-libraries dfmc-execution dfmc-debug-back-end licensing
+core-compiler-libraries: file-source-records release-info dood metering binary-manager coff-manager binary-builder coff-builder build-system parser-run-time dfmc-management dfmc-browser-support project-manager-libraries dfmc-execution dfmc-debug-back-end
pentium-compiler-libraries: core-compiler-libraries disasm dfmc-pentium-harp-cg dfmc-pentium-file-compiler
c-compiler-libraries: core-compiler-libraries dfmc-c-file-compiler
pentium-dw-libraries: pentium-compiler-libraries command-shell dfmc-shell dispatch-profiler
@@ -1576,11 +1573,6 @@
$(ENSURE_DIRECTORY) $(SOURCES_DIRECTORY)
$(CHECKOUT) library-packs fundev/Sources/Library-Packs $(LIBRARY_PACKS_DIRECTORY)
-checkout-licensing:
- $(ENSURE_RELEASE_AREA)
- $(ENSURE_DIRECTORY) $(LIB_DIRECTORY)
- $(CHECKOUT) licensing fundev/Sources/lib/licensing $(LICENSING_SOURCE)
-
checkout-map-statistics:
$(ENSURE_RELEASE_AREA)
$(ENSURE_DIRECTORY) $(TOOLS_DIRECTORY)
@@ -1799,7 +1791,7 @@
$(ENSURE_DIRECTORY) $(APP_DIRECTORY)
$(CHECKOUT) with-splash-screen fundev/Sources/app/with-splash-screen $(WITH_SPLASH_SCREEN_SOURCE)
-checkout-compiler: checkout-user-libraries checkout-internal-libraries checkout-release-info checkout-dfmc checkout-licensing checkout-variable-search checkout-walker checkout-metering checkout-motley checkout-project-manager checkout-source-records checkout-ppml checkout-parser-run-time checkout-memory-manager checkout-harp checkout-build-system checkout-dood checkout-dw checkout-command-shell
+checkout-compiler: checkout-user-libraries checkout-internal-libraries checkout-release-info checkout-dfmc checkout-variable-search checkout-walker checkout-metering checkout-motley checkout-project-manager checkout-source-records checkout-ppml checkout-parser-run-time checkout-memory-manager checkout-harp checkout-build-system checkout-dood checkout-dw checkout-command-shell
checkout-testworks-libraries: checkout-testworks checkout-testworks-specs checkout-gui-testworks
@@ -2513,14 +2505,6 @@
$(ENSURE_REGISTRY_ENTRY) file-source-records generic
$(BUILD_LIBRARY) file-source-records
-$(LICENSING):
- $(ENSURE_RUNTIME_LIBRARY) $(SYSTEM_DLL) system
- $(ENSURE_RUNTIME_LIBRARY) $(C_FFI_DLL) c-ffi
- $(ENSURE_LIBRARY) release-info
- $(ENSURE_SOURCES) licensing $(LICENSING_SOURCE)
- $(ENSURE_REGISTRY_ENTRY) licensing x86-win32
- $(BUILD_LIBRARY) licensing
-
$(METERING):
$(ENSURE_RUNTIME_LIBRARY) $(FUNCTIONAL_DYLAN_DLL) functional-dylan
$(ENSURE_SOURCES) metering $(METERING_SOURCE)
@@ -2995,7 +2979,6 @@
$(ENSURE_LIBRARY) motley
$(ENSURE_LIBRARY) tool-scepter
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_LIBRARY) dfmc-shell
$(ENSURE_LIBRARY) dispatch-profiler
$(ENSURE_SOURCES) dw $(DW_SOURCE)
@@ -3005,7 +2988,6 @@
$(DW):
$(ENSURE_LIBRARY) dfmc-c-file-compiler
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_LIBRARY) hd2c-dfmc-shell
$(ENSURE_LIBRARY) dispatch-profiler
$(ENSURE_SOURCES) dw $(DW_SOURCE)
@@ -3015,7 +2997,6 @@
$(INTERPRETER):
$(ENSURE_LIBRARY) dfmc-interpreter-file-compiler
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_LIBRARY) interpreter-dfmc-shell
$(ENSURE_LIBRARY) dispatch-profiler
$(ENSURE_SOURCES) dw $(DW_SOURCE)
@@ -3045,7 +3026,6 @@
$(MINIMAL_PENTIUM_DW):
$(ENSURE_LIBRARY) dfmc-pentium-file-compiler
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_LIBRARY) dfmc-shell
$(ENSURE_LIBRARY) dispatch-profiler
$(ENSURE_SOURCES) dw $(DW_SOURCE)
@@ -3056,7 +3036,6 @@
$(ENSURE_LIBRARY) environment-commands
$(ENSURE_LIBRARY) environment-internal-commands
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) minimal-console-compiler generic
$(BUILD_APPLICATION) minimal-console-compiler
@@ -3064,7 +3043,6 @@
$(ENSURE_LIBRARY) environment-application-commands
$(ENSURE_LIBRARY) environment-internal-commands
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) minimal-console-environment generic
$(BUILD_APPLICATION) minimal-console-environment
@@ -3075,7 +3053,6 @@
$(ENSURE_LIBRARY) basic-environment-project-wizard
$(ENSURE_LIBRARY) environment-internal-commands
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) source-control-hope-backend generic
$(ENSURE_REGISTRY_ENTRY) minimal-win32-environment x86-win32
$(BUILD_APPLICATION) minimal-win32-environment
@@ -3088,7 +3065,6 @@
$(ENSURE_LIBRARY) basic-environment-project-wizard
$(ENSURE_LIBRARY) environment-internal-commands
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) source-control-hope-backend generic
$(ENSURE_REGISTRY_ENTRY) minimal-gtk-environment x86-win32
$(BUILD_APPLICATION) minimal-gtk-environment
@@ -3099,7 +3075,6 @@
$(ENSURE_LIBRARY) motley
$(ENSURE_LIBRARY) tool-scepter
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) console-compiler generic
$(BUILD_APPLICATION) console-compiler
@@ -3110,7 +3085,6 @@
$(ENSURE_LIBRARY) tool-scepter
$(ENSURE_LIBRARY) remote-access-path
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) console-environment generic
$(BUILD_APPLICATION) console-environment
@@ -3125,7 +3099,6 @@
$(ENSURE_LIBRARY) remote-access-path
$(ENSURE_LIBRARY) tool-parser-generator
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) SourceSafeTypeLib x86-win32
$(ENSURE_REGISTRY_ENTRY) source-control-vss-backend x86-win32
$(ENSURE_REGISTRY_ENTRY) source-control-hope-backend generic
@@ -3144,7 +3117,6 @@
$(ENSURE_LIBRARY) remote-access-path
$(ENSURE_LIBRARY) tool-parser-generator
$(ENSURE_LIBRARY) release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) SourceSafeTypeLib x86-win32
$(ENSURE_REGISTRY_ENTRY) source-control-vss-backend x86-win32
$(ENSURE_REGISTRY_ENTRY) source-control-hope-backend generic
@@ -3186,7 +3158,6 @@
$(BASIC_PENTIUM_DW):
$(ENSURE_LIBRARY) dfmc-pentium-file-compiler
$(ENSURE_LIBRARY) basic-release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_LIBRARY) dfmc-shell
$(ENSURE_LIBRARY) dispatch-profiler
$(ENSURE_SOURCES) dw $(DW_SOURCE)
@@ -3196,14 +3167,12 @@
$(BASIC_CONSOLE_COMPILER):
$(ENSURE_LIBRARY) environment-commands
$(ENSURE_LIBRARY) basic-release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) basic-console-compiler generic
$(BUILD_APPLICATION) basic-console-compiler
$(BASIC_CONSOLE_ENVIRONMENT):
$(ENSURE_LIBRARY) environment-application-commands
$(ENSURE_LIBRARY) basic-release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) basic-console-environment generic
$(BUILD_APPLICATION) basic-console-environment
@@ -3212,7 +3181,6 @@
$(ENSURE_LIBRARY) dylan-environment
$(ENSURE_LIBRARY) basic-environment-project-wizard
$(ENSURE_LIBRARY) basic-release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) basic-win32-environment x86-win32
$(BUILD_APPLICATION) basic-win32-environment
@@ -3222,7 +3190,6 @@
$(ENSURE_LIBRARY) dylan-environment
$(ENSURE_LIBRARY) basic-environment-project-wizard
$(ENSURE_LIBRARY) basic-release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) basic-gtk-environment x86-win32
$(BUILD_APPLICATION) basic-gtk-environment
@@ -3245,7 +3212,6 @@
$(ENSURE_LIBRARY) motley
$(ENSURE_LIBRARY) tool-scepter
$(ENSURE_LIBRARY) enhanced-release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_LIBRARY) dfmc-shell
$(ENSURE_LIBRARY) dispatch-profiler
$(ENSURE_SOURCES) dw $(DW_SOURCE)
@@ -3257,7 +3223,6 @@
$(ENSURE_LIBRARY) enhanced-release-info
$(ENSURE_LIBRARY) motley
$(ENSURE_LIBRARY) tool-scepter
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) enhanced-console-compiler generic
$(BUILD_APPLICATION) enhanced-console-compiler
@@ -3267,7 +3232,6 @@
$(ENSURE_LIBRARY) motley
$(ENSURE_LIBRARY) tool-scepter
$(ENSURE_LIBRARY) remote-access-path
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) enhanced-console-environment generic
$(BUILD_APPLICATION) enhanced-console-environment
@@ -3280,7 +3244,6 @@
$(ENSURE_LIBRARY) tool-scepter
$(ENSURE_LIBRARY) remote-access-path
$(ENSURE_LIBRARY) enhanced-release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) SourceSafeTypeLib x86-win32
$(ENSURE_REGISTRY_ENTRY) source-control-vss-backend x86-win32
$(ENSURE_REGISTRY_ENTRY) enhanced-win32-environment x86-win32
@@ -3296,7 +3259,6 @@
$(ENSURE_LIBRARY) tool-scepter
$(ENSURE_LIBRARY) remote-access-path
$(ENSURE_LIBRARY) enhanced-release-info
- $(ENSURE_LIBRARY) licensing
$(ENSURE_REGISTRY_ENTRY) SourceSafeTypeLib x86-win32
$(ENSURE_REGISTRY_ENTRY) source-control-vss-backend x86-win32
$(ENSURE_REGISTRY_ENTRY) enhanced-gtk-environment x86-win32
Modified: trunk/fundev/sources/environment/reports/bug-report.dylan
==============================================================================
--- trunk/fundev/sources/environment/reports/bug-report.dylan (original)
+++ trunk/fundev/sources/environment/reports/bug-report.dylan Tue May 23 07:28:57 2006
@@ -127,7 +127,6 @@
(title :: <string>, value :: <string>)
add!(properties, pair(title, value))
end method record-property;
- let (serial-number, evaluation?, expiration, user, organization) = license-info();
let os-variant
= select ($os-variant)
#"winxp" => "Windows XP";
@@ -138,12 +137,10 @@
#"winme" => "Windows ME";
#"win3.1" => "Windows 3.1"
end;
- let edition-name = format-to-string("%s %s", release-product-name(), release-edition());
- user & record-property("User", user);
- organization & record-property("Organization", organization);
+ let edition-name
+ = format-to-string("%s %s", release-product-name(), release-edition());
record-property("Software edition", edition-name);
record-property("Software version", release-version());
- record-property("Serial number", serial-number);
record-property("Operating system",
format-to-string("%s %s",
os-variant, $os-version));
@@ -428,7 +425,6 @@
(title :: <string>, value :: <string>)
add!(properties, pair(title, value))
end method record-property;
- let (serial-number, evaluation?, expiration, user, organization) = license-info();
let os-variant
= select ($os-variant)
#"winxp" => "Windows XP";
@@ -439,12 +435,10 @@
#"winme" => "Windows ME";
#"win3.1" => "Windows 3.1"
end;
- let edition-name = format-to-string("%s %s", release-product-name(), release-edition());
- user & record-property("User", user);
- organization & record-property("Organization", organization);
+ let edition-name
+ = format-to-string("%s %s", release-product-name(), release-edition());
record-property("Software edition", edition-name);
record-property("Software version", release-version());
- record-property("Serial number", serial-number);
record-property("Operating system",
format-to-string("%s %s",
os-variant, $os-version));
Modified: trunk/fundev/sources/environment/reports/library.dylan
==============================================================================
--- trunk/fundev/sources/environment/reports/library.dylan (original)
+++ trunk/fundev/sources/environment/reports/library.dylan Tue May 23 07:28:57 2006
@@ -10,7 +10,6 @@
define library environment-reports
use functional-dylan;
use system;
- use licensing;
use environment-protocols;
use environment-manager;
Modified: trunk/fundev/sources/environment/reports/module.dylan
==============================================================================
--- trunk/fundev/sources/environment/reports/module.dylan (original)
+++ trunk/fundev/sources/environment/reports/module.dylan Tue May 23 07:28:57 2006
@@ -12,8 +12,6 @@
exclude: { info-name };
use environment-protocols;
use environment-manager;
- use licensing,
- import: { license-info };
// Report protocols
export <report>,
Modified: trunk/fundev/sources/environment/tools/help.dylan
==============================================================================
--- trunk/fundev/sources/environment/tools/help.dylan (original)
+++ trunk/fundev/sources/environment/tools/help.dylan Tue May 23 07:28:57 2006
@@ -9,7 +9,7 @@
/// Constants
-define constant $bullet-character = '\<95>';
+//define constant $bullet-character = '\<95>';
define constant $copyright-character = '\<a9>';
define constant $registered-character = '\<ae>';
define constant $trademark-character = '\<99>';
@@ -21,53 +21,27 @@
define variable *help-file-string*
= as(<string>, *help-file*);
-define constant $beta-release-text
- = #["This is a beta release of Functional Developer. Please submit bugs",
- "to support at functionalobjects.com.",
- "",
- "Note that distribution of software created with any beta version",
- "of Functional Developer is prohibited."];
-
-define constant $extra-features-text
- = #["Upgrade to Functional Developer(tm)",
- "Professional or Enterprise Edition",
- "for these additional features:"];
-// = #["If you like Functional Developer Personal Edition,",
-// "upgrade to Professional or Enterprise",
-// "for these additional features:"];
-
-define constant $extra-features-info
- = #["COM/OLE/ActiveX Support",
- "ODBC Connectivity",
- "C Library Interoperability",
- "CORBA Distributed Objects (Enterprise Edition)",
- "Cross-Network Debugging (Enterprise Edition)",
- "60-Day Free Getting Started Support",
- "Printed Documentation"];
-
-define constant $purchasing-text
- = #["Shop on-line at the Function Developer Website or call our",
- "24-hour sales line now!"];
-
-define constant $telesales-numbers
- = #["1 888 884 8871 (US: toll free)",
- "1 617 374 2521 (US: Boston)",
- "44 (0)1223 873883 (UK: Cambridge)"];
+// define constant $beta-release-text
+// = #["This is a beta release of Functional Developer. Please submit bugs",
+// "to support at functionalobjects.com.",
+// "",
+// "Note that distribution of software created with any beta version",
+// "of Functional Developer is prohibited."];
define constant $license-font
= make(<text-style>,
family: #"fix");
-define constant $about-box-font
- = make(<text-style>,
- family: #"sans-serif",
- size: #"large");
-
-define constant $about-box-title-font
- = make(<text-style>,
- family: #"sans-serif",
- size: #"huge",
- weight: #"bold");
+// define constant $about-box-font
+// = make(<text-style>,
+// family: #"sans-serif",
+// size: #"large");
+
+// define constant $about-box-title-font
+// = make(<text-style>,
+// family: #"sans-serif",
+// size: #"huge",
+// weight: #"bold");
define constant $about-box-copyright-font
= make(<text-style>,
@@ -156,29 +130,6 @@
/// About Box
-define function split-string
- (string :: <byte-string>, character :: <byte-character>)
- => (strings :: <sequence>)
- let results = make(<stretchy-vector>);
- let old-position :: <integer> = 0;
- let new-position :: <integer> = 0;
- let string-size :: <integer> = string.size;
- while (new-position < string-size)
- when (string[new-position] = character)
- add!(results, copy-sequence(string, start: old-position, end: new-position));
- while (new-position < string-size - 1 & string[new-position + 1] = ' ')
- new-position := new-position + 1
- end;
- old-position := new-position + 1;
- end;
- new-position := new-position + 1;
- end;
- if (old-position < string-size - 1)
- add!(results, copy-sequence(string, start: old-position))
- end;
- results
-end function split-string;
-
define function use-copyright-symbols
(string :: <byte-string>) => (new-string :: <byte-string>)
let string-size = string.size;
@@ -220,43 +171,12 @@
copy-sequence(new-string, end: pos)
end function use-copyright-symbols;
-define function edition-info-text
- () => (text :: <sequence>)
- let name = use-copyright-symbols(release-name());
- let version = use-copyright-symbols(release-version());
- let copyright
- = map(use-copyright-symbols, split-string(release-copyright(), '.'));
- let entries = concatenate(vector(name, version), copyright);
- let user-info-entries = user-info-text();
- concatenate(remove(entries, #f),
- if (empty?(user-info-entries))
- #[]
- else
- vector("")
- end,
- user-info-entries)
-end function edition-info-text;
-
define function about-box-info-text
() => (text :: <sequence>)
let version = use-copyright-symbols(release-version());
- concatenate(vector(version),
- user-info-text())
+ vector(version)
end function about-box-info-text;
-define function user-info-text
- () => (text :: <sequence>)
- let (serial-number, evaluation?, expiration, user, company) = license-info();
- ignore(expiration);
- let entries
- = vector(unless (release-free-edition?() | evaluation?)
- format-to-string("Serial #%s", serial-number)
- end,
- user,
- company);
- remove(entries, #f)
-end function user-info-text;
-
define frame <about-box> (<dialog-frame>)
pane splash-screen-pane (frame)
make(<label>, label: $splash-screen-bitmap);
@@ -264,12 +184,6 @@
make-labels-layout
(about-box-info-text(),
text-style: $about-box-copyright-font);
- pane register-button (frame)
- make(<button>,
- label: "&Register",
- activate-callback: method (button)
- frame-register-developer(sheet-frame(button))
- end);
pane license-agreement-button (frame)
make(<button>,
label: "&License Terms",
@@ -286,7 +200,6 @@
activate-callback: exit-dialog);
pane exit-buttons (frame)
horizontally (x-spacing: 8, equalize-widths?: #t)
- frame.register-button;
frame.license-agreement-button;
frame.ok-button
end;
@@ -324,9 +237,6 @@
with-frame-manager (frame-manager(frame))
let about-box = make(<about-box>, owner: frame);
start-dialog(about-box);
- if (show-upgrade-box?())
- frame-show-upgrade-box(frame)
- end
end
end method frame-show-about-box;
@@ -347,170 +257,6 @@
end method frame-help-source;
-/// Beta-Release box
-
-define frame <beta-release-box> (<dialog-frame>)
- pane beta-release-name (frame)
- make(<label>,
- label: use-copyright-symbols(release-name()),
- text-style: $about-box-title-font);
- pane beta-release-text (frame)
- make-labels-layout(map(use-copyright-symbols, $beta-release-text),
- text-style: $about-box-font);
- pane beta-release-box-image-pane (frame)
- make(<label>, label: $about-box-bitmap, text-style: $about-box-font);
- pane ok-button (frame)
- make(<button>,
- label: "OK",
- width: 70, min-width: 70, fixed-width?: #t,
- activate-callback: exit-dialog,
- default?: #t);
- pane exit-buttons (frame)
- horizontally (x-spacing: 8, equalize-widths?: #t)
- frame.ok-button
- end;
- layout (frame)
- horizontally (x-spacing: 8)
- frame.beta-release-box-image-pane;
- vertically (y-spacing: 8)
- frame.beta-release-name;
- frame.beta-release-text;
- make(<null-pane>, max-height: $fill, height: 1);
- horizontally (max-width: $fill)
- make(<null-pane>, max-width: $fill, height: 1);
- frame.exit-buttons
- end
- end
- end;
- input-focus (frame)
- frame.ok-button;
- keyword title: = "Functional Developer Beta";
- keyword exit-buttons?: = #f;
- keyword center?: = #t;
- //--- This would be a good idea if DUIM didn't screw it up!
- // keyword fixed-width?: = #t;
- // keyword fixed-height?: = #t;
-end frame <beta-release-box>;
-
-define method initialize
- (frame :: <beta-release-box>, #key) => ()
- next-method();
- frame-default-button(frame) := frame.ok-button
-end method initialize;
-
-define method frame-show-beta-release-box
- (frame :: <environment-frame>) => ()
- with-frame-manager (frame-manager(frame))
- let frame = make(<beta-release-box>, owner: frame);
- start-dialog(frame)
- end
-end method frame-show-beta-release-box;
-
-
-/// Upgrade box
-
-define frame <upgrade-box> (<dialog-frame>)
- pane edition-info (frame)
- make-labels-layout
- (edition-info-text(),
- text-style: $about-box-copyright-font);
- pane extra-features-text (frame)
- make-labels-layout(map(use-copyright-symbols, $extra-features-text),
- text-style: $about-box-title-font);
- pane extra-features-info (frame)
- make-labels-layout(map(use-copyright-symbols, $extra-features-info),
- prefix: format-to-string("%c ", $bullet-character),
- text-style: $about-box-font);
- pane dylan-web-site-link (frame)
- make(<active-label>,
- foreground: $blue,
- text-style: $about-box-font,
- underline?: #t,
- label: "Functional Developer Web Site",
- activate-callback: method (label)
- frame-open-dylan-web-page(sheet-frame(label))
- end);
- pane purchasing-text (frame)
- make-labels-layout($purchasing-text, text-style: $about-box-font);
- pane telesales-info (frame)
- make-labels-layout($telesales-numbers,
- text-style: $about-box-font);
- pane upgrade-box-image-pane (frame)
- make(<label>, label: $about-box-bitmap, text-style: $about-box-font);
- pane purchase-button (frame)
- make(<button>,
- label: "&Purchase",
- activate-callback: method (button)
- let dialog = sheet-frame(button);
- frame-purchase-dylan(dialog)
- end);
- pane ok-button (frame)
- make(<button>,
- label: "OK",
- activate-callback: exit-dialog,
- default?: #t);
- pane exit-buttons (frame)
- horizontally (x-spacing: 8, equalize-widths?: #t)
- frame.purchase-button;
- frame.ok-button
- end;
- pane basic-text-layout (frame)
- vertically (y-spacing: 16)
- vertically (y-spacing: 4)
- frame.extra-features-text;
- horizontally ()
- make(<null-pane>, width: 32, height: 1);
- frame.extra-features-info
- end;
- frame.purchasing-text;
- horizontally ()
- make(<null-pane>, width: 32, height: 1);
- vertically (y-spacing: 4)
- frame.dylan-web-site-link;
- frame.telesales-info
- end
- end
- end
- end;
- layout (frame)
- horizontally (x-spacing: 8)
- vertically (y-spacing: 8)
- frame.upgrade-box-image-pane;
- horizontally (y-alignment: #"bottom", max-height: $fill)
- frame.edition-info
- end
- end;
- vertically (y-spacing: 8, x-alignment: #"right", max-width: $fill)
- frame.basic-text-layout;
- make(<null-pane>, max-height: $fill, height: 1);
- frame.exit-buttons
- end
- end;
- input-focus (frame)
- frame.ok-button;
- keyword title: = "Upgrade Functional Developer";
- keyword exit-buttons?: = #f;
- keyword center?: = #t;
- //--- This would be a good idea if DUIM didn't screw it up!
- // keyword fixed-width?: = #t;
- // keyword fixed-height?: = #t;
-end frame <upgrade-box>;
-
-define method initialize
- (frame :: <upgrade-box>, #key) => ()
- next-method();
- frame-default-button(frame) := frame.ok-button
-end method initialize;
-
-define method frame-show-upgrade-box
- (frame :: <environment-frame>) => ()
- with-frame-manager (frame-manager(frame))
- let frame = make(<upgrade-box>, owner: frame);
- start-dialog(frame)
- end
-end method frame-show-upgrade-box;
-
-
/// HELP-CREDITS
/*---*** andrewa: this isn't currently used
@@ -561,9 +307,6 @@
/// Web site command tables
-define constant $purchase-web-page
- = format-to-string("%s/%s", release-web-address(), "index.phtml");
-
define constant $download-doc-page
= format-to-string("%s/%s", release-web-address(), "documentation.phtml");
@@ -573,224 +316,6 @@
frame-open-object(frame, location)
end function frame-open-dylan-web-page;
-define function frame-purchase-dylan
- (frame :: <frame>) => ()
- frame-open-dylan-web-page(frame, page: $purchase-web-page)
-end function frame-purchase-dylan;
-
-
-/// Registration
-
-define function frame-register-developer
- (frame :: false-or(<frame>),
- #key title = "Register Functional Developer",
- owner = frame)
- => (success? :: <boolean>)
- let products = unregistered-products();
- if (empty?(products))
- if (environment-question
- (format-to-string
- ("All %s packages on this system have been registered.\n"
- "Do you wish to purchase additional products from our web site?",
- release-product-name()),
- owner: owner,
- exit-style: #"yes-no"))
- //---*** TODO: Should ensure that frame isn't #f here somehow!
- frame-purchase-dylan(owner | current-frame())
- end;
- #t
- else
- let products
- = map(method(product)
- let name = select (product)
- #"IDE" =>
- format-to-string("%s %s", release-product-name(),
- release-edition());
- #"console-tools" =>
- "Console-Based Developer Tools";
- otherwise =>
- library-pack-full-name(product);
- end;
- vector(name, product)
- end,
- products);
- do-register-developer-dialog(frame, products, title: title, owner: owner)
- end
-end function frame-register-developer;
-
-define function do-register-developer-dialog
- (frame :: false-or(<frame>),
- products :: <sequence>,
- #key title = "Register Functional Developer",
- owner = frame)
- => (success? :: <boolean>)
- let framem = if (owner)
- frame-manager(owner)
- else
- find-frame-manager()
- end;
- with-frame-manager (framem)
- let link-button
- = make(<push-button>,
- label: "Purchase",
- activate-callback:
- method (gadget)
- frame-purchase-dylan(sheet-frame(gadget))
- end method);
- let products-list
- = make(<option-box>,
- items: products,
- label-key: first,
- value-key: second);
- let serial-number
- = make(<text-field>, min-width: 250, max-width: 250);
- let license-number
- = make(<text-field>, min-width: 250, max-width: 250);
- let group-box-1
- = grouping ("Purchase Licenses", max-width: $fill)
- horizontally (spacing: 4, y-alignment: #"center")
- vertically ()
- make(<label>,
- label: "If you need to purchase licenses for Functional Objects"
- " products, please press this button.",
- multi-line?: #t,
- min-width: 250,
- max-width: 250);
- end;
- link-button;
- end
- end;
- let group-box-2
- = grouping ("Register Products", max-width: $fill)
- vertically (spacing: 8)
- vertically (spacing: -2)
- make(<label>,
- label: "To register a product, enter the serial number and license key");
- make(<label>,
- label: "exactly as given to you by Functional Objects. Use the 'Apply'");
- make(<label>,
- label: "button to register multiple products.");
- end;
- make(<table-layout>,
- columns: 2,
- x-alignment: #(#"right", #"left"),
- y-spacing: 4,
- y-alignment: #"center",
- children:
- vector(make(<label>, label: "Select Product:"),
- products-list,
- make(<label>, label: "Serial number:"),
- serial-number,
- make(<label>, label: "License key:"),
- license-number))
- end
- end;
- let exit-button
- = make(<push-button>,
- label: "OK",
- activate-callback:
- method (gadget)
- let dialog = sheet-frame(gadget);
- if (do-register-product(dialog, products-list, serial-number, license-number))
- exit-dialog(dialog)
- end;
- end);
- let cancel-button
- = make(<push-button>,
- label: "Cancel",
- activate-callback: cancel-dialog);
- let apply-button
- = make(<push-button>,
- label: "Apply",
- activate-callback:
- method (gadget)
- let dialog = sheet-frame(gadget);
- do-register-product(dialog, products-list, serial-number, license-number);
- if (empty?(gadget-items(products-list)))
- exit-dialog(dialog)
- end;
- end method);
- let layout
- = make(<column-layout>,
- x-alignment: #"right",
- y-spacing: 10,
- children:
- vector(vertically (spacing: 10, max-width: $fill)
- group-box-1;
- group-box-2;
- end,
- make(<row-layout>,
- x-alignment: #"right",
- x-spacing: 4, equalize-widths?: #t,
- children: vector(exit-button, cancel-button, apply-button))));
-
- let dialog
- = make(<dialog-frame>,
- title: title,
- layout: layout,
- exit-buttons?: #f,
- exit-button: exit-button,
- cancel-button: cancel-button,
- mode: #"modal",
- owner: frame,
- width: 360,
- fixed-width?: #t,
- fixed-height?: #t);
- let success? = start-dialog(dialog);
- if (success?)
- #t
- end
- end;
-end function do-register-developer-dialog;
-
-/// All the extra arguments are needed because we've built the dialog by hand ...
-define function do-register-product
- (frame :: <frame>, products-list :: <option-box>,
- serial-number :: <text-field>, license-number :: <text-field>)
- => (success? :: <boolean>)
- let product = gadget-value(products-list);
- let serial = gadget-value(serial-number);
- let key = gadget-value(license-number);
- if (size(serial) ~= size("FDeee-vvvv-nnnnnnnnnnnn"))
- environment-error-message("Malformed serial number; "
- "please correct your errors and try again.",
- owner: frame);
- #f
- elseif (size(key) ~= size("aaaabbbbccccxxxx"))
- environment-error-message("Malformed license key; "
- "please correct your errors and try again.",
- owner: frame);
- #f
- else
- let success?
- = block()
- register-product(product, serial, key)
- exception (c :: <license-validation-failure>)
- environment-error-message(format-to-string
- ("%s\nPlease correct your errors and try again.",
- c),
- owner: frame);
- #f
- end;
- if (success?)
- let old-products = gadget-items(products-list);
- let new-products = make(<vector>, size: size(old-products) - 1);
- unless (zero?(size(new-products)))
- let j :: <integer> = 0;
- for (i from 0 below size(old-products))
- unless (product = second(old-products[i]))
- new-products[j] := old-products[i];
- j := j + 1
- end;
- end;
- gadget-value(products-list) := second(new-products[0]);
- end;
- gadget-items(products-list) := new-products;
- end;
- success?
- end
-end function do-register-product;
-
/// Help command table
Modified: trunk/fundev/sources/environment/tools/initialization.dylan
==============================================================================
--- trunk/fundev/sources/environment/tools/initialization.dylan (original)
+++ trunk/fundev/sources/environment/tools/initialization.dylan Tue May 23 07:28:57 2006
@@ -65,8 +65,6 @@
define method handle-environment-startup
(frame :: <environment-frame>) => ()
broadcast($environment-channel, make(<environment-started-message>));
- show-beta-release-box?() & frame-show-beta-release-box(frame);
- show-upgrade-box?() & frame-show-upgrade-box(frame);
let (process, id) = just-in-time-debugging-arguments();
let filename = *startup-open-file*;
case
@@ -121,19 +119,6 @@
end function six-months-after-build?;
*/
-///---*** Should we make this harder to hack? It hardly seems worth it...
-///---*** NOTE: As both the Basic and Enhanced editions will cost money,
-///---*** it no longer seems right to ask the user for more money all the time.
-define method show-upgrade-box?
- () => (show? :: <boolean>)
- #f
-end method show-upgrade-box?;
-
-define method show-beta-release-box?
- () => (show? :: <boolean>)
- release-beta?() & ~release-internal?()
-end method show-beta-release-box?;
-
/// Project browser startup
//---*** cpage: 97.08.13 Note that status codes will eventually be replaced by
Modified: trunk/fundev/sources/environment/tools/library.dylan
==============================================================================
--- trunk/fundev/sources/environment/tools/library.dylan (original)
+++ trunk/fundev/sources/environment/tools/library.dylan Tue May 23 07:28:57 2006
@@ -21,7 +21,5 @@
use deuce;
use duim-deuce; // We need to use duim-deuce to share its images
- use licensing; // We use this for the about box information
-
export environment-tools;
end library environment-tools;
Modified: trunk/fundev/sources/environment/tools/module.dylan
==============================================================================
--- trunk/fundev/sources/environment/tools/module.dylan (original)
+++ trunk/fundev/sources/environment/tools/module.dylan Tue May 23 07:28:57 2006
@@ -37,8 +37,6 @@
use environment-framework;
use environment-server;
- use licensing;
-
// Some useful constants
export $n/a,
$unknown,
@@ -480,9 +478,6 @@
$describer-window-small-icon,
$find-window-small-icon;
- // Doesn't seem to fit anywhere else ...
- export frame-register-developer;
-
export <frame-module-gadget-mixin>,
frame-available-modules,
make-module-tool-bar-buttons,
More information about the chatter
mailing list