Skip to content

Commit 566eb03

Browse files
committed
(esnavigator.spec.in, LICENSE, README, ChangeLog) : New for rpmbuild.
(AC_INIT) : Change the package name from es-www to esnavigator. (Makefile.am, configure.ac, etc.) : Include esnavigator.spec and slightly reorganize the tree structure for rpmbuild. git-svn-id: http://es-operating-system.googlecode.com/svn/trunk/www@2758 d15c3b8f-5b43-0410-be93-4d5a55ce2954
1 parent 5baf1e2 commit 566eb03

25 files changed

+6297
-67
lines changed

ChangeLog

+5,966
Large diffs are not rendered by default.

LICENSE

+202
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

Makefile.am

+16-13
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ noinst_PROGRAMS : $(LDADD) libesjsapi.a libesv8api.a
11581158
js_LDADD = $(LDADD) libesjsapi.a
11591159
v8_LDADD = $(LDADD) libesv8api.a -lv8
11601160

1161-
harness_SOURCES = harness/harness.cpp
1161+
harness_SOURCES = harness.cpp
11621162
harness_LDADD = $(js_LDADD)
11631163

11641164
Any_test_SOURCES = Any.test.cpp
@@ -1235,25 +1235,28 @@ navigatordatadir = $(esrilledatadir)/navigator
12351235
aboutdatadir = $(navigatordatadir)/about
12361236

12371237
dist_navigatordata_DATA = \
1238-
navigator/about.html \
1239-
navigator/default.css \
1240-
navigator/navigator.html \
1241-
navigator/Cancel_32x32.png \
1242-
navigator/Favorites_32x32.png \
1243-
navigator/Gear_32x32.gif \
1244-
navigator/Gear_32x32.png \
1245-
navigator/Next_32x32.png \
1246-
navigator/Previous_32x32.png \
1247-
navigator/Refresh_32x32.png \
1248-
navigator/Stop_32x32.png
1238+
data/navigator/about.html \
1239+
data/navigator/default.css \
1240+
data/navigator/navigator.html \
1241+
data/navigator/Cancel_32x32.png \
1242+
data/navigator/Favorites_32x32.png \
1243+
data/navigator/Gear_32x32.gif \
1244+
data/navigator/Gear_32x32.png \
1245+
data/navigator/Next_32x32.png \
1246+
data/navigator/Previous_32x32.png \
1247+
data/navigator/Refresh_32x32.png \
1248+
data/navigator/Stop_32x32.png
12491249

12501250
dist_aboutdata_DATA = \
1251-
navigator/about/blank
1251+
data/navigator/about/blank
12521252

12531253
clean-local:
12541254
rm -rf org css html $(generated_sources) $(generated_headers) $(generated_scanners) *.output
12551255

12561256
EXTRA_DIST = \
1257+
esnavigator.spec.in \
1258+
esnavigator.spec \
1259+
LICENSE \
12571260
config.h \
12581261
idl/COPYRIGHT.html \
12591262
idl/2dcontext.idl \

Makefile.in

+26-35
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ noinst_PROGRAMS = harness$(EXEEXT) Any.test$(EXEEXT) \
5757
NavigatorV8.test$(EXEEXT) Profile.test$(EXEEXT)
5858
navigatorlibexec_PROGRAMS = navigator$(EXEEXT)
5959
subdir = .
60-
DIST_COMMON = $(am__configure_deps) $(dist_aboutdata_DATA) \
60+
DIST_COMMON = README $(am__configure_deps) $(dist_aboutdata_DATA) \
6161
$(dist_bin_SCRIPTS) $(dist_navigatordata_DATA) \
62-
$(srcdir)/../depcomp $(srcdir)/../install-sh \
63-
$(srcdir)/../missing $(srcdir)/../ylwrap $(srcdir)/Makefile.am \
64-
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
65-
$(top_srcdir)/configure CSSGrammar.cc CSSGrammar.h
62+
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
63+
$(srcdir)/config.h.in $(srcdir)/esnavigator.spec.in \
64+
$(top_srcdir)/configure CSSGrammar.cc CSSGrammar.h ChangeLog \
65+
depcomp install-sh missing ylwrap
6666
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
6767
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
6868
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -71,7 +71,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
7171
configure.lineno config.status.lineno
7272
mkinstalldirs = $(install_sh) -d
7373
CONFIG_HEADER = config.h
74-
CONFIG_CLEAN_FILES =
74+
CONFIG_CLEAN_FILES = esnavigator.spec
7575
CONFIG_CLEAN_VPATH_FILES =
7676
LIBRARIES = $(noinst_LIBRARIES)
7777
AR = ar
@@ -466,7 +466,7 @@ am__uninstall_files_from_dir = { \
466466
}
467467
SCRIPTS = $(dist_bin_SCRIPTS)
468468
DEFAULT_INCLUDES = -I.@am__isrc@
469-
depcomp = $(SHELL) $(top_srcdir)/../depcomp
469+
depcomp = $(SHELL) $(top_srcdir)/depcomp
470470
am__depfiles_maybe = depfiles
471471
am__mv = mv -f
472472
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -475,7 +475,7 @@ CXXLD = $(CXX)
475475
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
476476
-o $@
477477
YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
478-
YLWRAP = $(top_srcdir)/../ylwrap
478+
YLWRAP = $(top_srcdir)/ylwrap
479479
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
480480
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
481481
CCLD = $(CC)
@@ -1436,7 +1436,7 @@ libeshtml5_a_SOURCES = Object.h ObjectArrayImp.h Reflect.h Any.cpp \
14361436
xhr/XMLHttpRequestUploadImp.h
14371437
js_LDADD = $(LDADD) libesjsapi.a
14381438
v8_LDADD = $(LDADD) libesv8api.a -lv8
1439-
harness_SOURCES = harness/harness.cpp
1439+
harness_SOURCES = harness.cpp
14401440
harness_LDADD = $(js_LDADD)
14411441
Any_test_SOURCES = Any.test.cpp
14421442
Any_test_LDADD = $(js_LDADD)
@@ -1487,22 +1487,25 @@ esrilledatadir = $(datadir)/esrille
14871487
navigatordatadir = $(esrilledatadir)/navigator
14881488
aboutdatadir = $(navigatordatadir)/about
14891489
dist_navigatordata_DATA = \
1490-
navigator/about.html \
1491-
navigator/default.css \
1492-
navigator/navigator.html \
1493-
navigator/Cancel_32x32.png \
1494-
navigator/Favorites_32x32.png \
1495-
navigator/Gear_32x32.gif \
1496-
navigator/Gear_32x32.png \
1497-
navigator/Next_32x32.png \
1498-
navigator/Previous_32x32.png \
1499-
navigator/Refresh_32x32.png \
1500-
navigator/Stop_32x32.png
1490+
data/navigator/about.html \
1491+
data/navigator/default.css \
1492+
data/navigator/navigator.html \
1493+
data/navigator/Cancel_32x32.png \
1494+
data/navigator/Favorites_32x32.png \
1495+
data/navigator/Gear_32x32.gif \
1496+
data/navigator/Gear_32x32.png \
1497+
data/navigator/Next_32x32.png \
1498+
data/navigator/Previous_32x32.png \
1499+
data/navigator/Refresh_32x32.png \
1500+
data/navigator/Stop_32x32.png
15011501

15021502
dist_aboutdata_DATA = \
1503-
navigator/about/blank
1503+
data/navigator/about/blank
15041504

15051505
EXTRA_DIST = \
1506+
esnavigator.spec.in \
1507+
esnavigator.spec \
1508+
LICENSE \
15061509
config.h \
15071510
idl/COPYRIGHT.html \
15081511
idl/2dcontext.idl \
@@ -1602,6 +1605,8 @@ $(srcdir)/config.h.in: $(am__configure_deps)
16021605

16031606
distclean-hdr:
16041607
-rm -f config.h stamp-h1
1608+
esnavigator.spec: $(top_builddir)/config.status $(srcdir)/esnavigator.spec.in
1609+
cd $(top_builddir) && $(SHELL) ./config.status $@
16051610

16061611
clean-noinstLIBRARIES:
16071612
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -8066,20 +8071,6 @@ ScriptV8_test-Test.glut.obj: Test.glut.cpp
80668071
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
80678072
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ScriptV8_test_CXXFLAGS) $(CXXFLAGS) -c -o ScriptV8_test-Test.glut.obj `if test -f 'Test.glut.cpp'; then $(CYGPATH_W) 'Test.glut.cpp'; else $(CYGPATH_W) '$(srcdir)/Test.glut.cpp'; fi`
80688073

8069-
harness.o: harness/harness.cpp
8070-
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT harness.o -MD -MP -MF $(DEPDIR)/harness.Tpo -c -o harness.o `test -f 'harness/harness.cpp' || echo '$(srcdir)/'`harness/harness.cpp
8071-
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/harness.Tpo $(DEPDIR)/harness.Po
8072-
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='harness/harness.cpp' object='harness.o' libtool=no @AMDEPBACKSLASH@
8073-
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
8074-
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o harness.o `test -f 'harness/harness.cpp' || echo '$(srcdir)/'`harness/harness.cpp
8075-
8076-
harness.obj: harness/harness.cpp
8077-
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT harness.obj -MD -MP -MF $(DEPDIR)/harness.Tpo -c -o harness.obj `if test -f 'harness/harness.cpp'; then $(CYGPATH_W) 'harness/harness.cpp'; else $(CYGPATH_W) '$(srcdir)/harness/harness.cpp'; fi`
8078-
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/harness.Tpo $(DEPDIR)/harness.Po
8079-
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='harness/harness.cpp' object='harness.obj' libtool=no @AMDEPBACKSLASH@
8080-
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
8081-
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o harness.obj `if test -f 'harness/harness.cpp'; then $(CYGPATH_W) 'harness/harness.cpp'; else $(CYGPATH_W) '$(srcdir)/harness/harness.cpp'; fi`
8082-
80838074
navigator-Navigator.o: Navigator.cpp
80848075
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(navigator_CXXFLAGS) $(CXXFLAGS) -MT navigator-Navigator.o -MD -MP -MF $(DEPDIR)/navigator-Navigator.Tpo -c -o navigator-Navigator.o `test -f 'Navigator.cpp' || echo '$(srcdir)/'`Navigator.cpp
80858076
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/navigator-Navigator.Tpo $(DEPDIR)/navigator-Navigator.Po

README

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
This directory contains ES web browser.
2+
3+
ES web browser is open source software. See the file LICENSE for
4+
copying permission. The manuals, and some of the software programs, are
5+
under different terms; see the individual source files for details.
6+
7+
See http://code.google.com/p/es-operating-system/ for how to report problems.

0 commit comments

Comments
 (0)