Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
libxslt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenVMS
libraries
libxslt
Commits
4dc9cbe0cc48
Commit
4dc9cbe0cc48
authored
22 years ago
by
Igor Zlatkovic
Browse files
Options
Downloads
Patches
Plain Diff
introduced double-run compilation
parent
b47ce1c60474
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
win32/Makefile.msvc
+85
-22
85 additions, 22 deletions
win32/Makefile.msvc
win32/configure.js
+6
-0
6 additions, 0 deletions
win32/configure.js
with
91 additions
and
22 deletions
win32/Makefile.msvc
+
85
−
22
View file @
4dc9cbe0
...
...
@@ -63,4 +63,5 @@
# Places where intermediate files produced by the compiler go
XSLT_INTDIR
=
$(
XSLT_BASENAME
)
.int
XSLT_INTDIR_A
=
$(
XSLT_BASENAME
)
_a.int
EXSLT_INTDIR
=
$(
EXSLT_BASENAME
)
.int
...
...
@@ -66,4 +67,5 @@
EXSLT_INTDIR
=
$(
EXSLT_BASENAME
)
.int
EXSLT_INTDIR_A
=
$(
EXSLT_BASENAME
)
_a.int
UTILS_INTDIR
=
utils.int
# The preprocessor and its options.
...
...
@@ -79,12 +81,7 @@
LD
=
link.exe
LDFLAGS
=
/nologo
LDFLAGS
=
$(
LDFLAGS
)
/LIBPATH:
$(
BINDIR
)
/LIBPATH:
$(
LIBPREFIX
)
LIBS
=
!if
"$(STATIC)"
==
"1"
LIBS
=
libxml2_a.lib iconv_a.lib wsock32.lib
!
else
LIBS
=
libxml2.lib
!
endif
LIBS
=
wsock32.lib
# The archiver and its options.
AR
=
lib.exe
...
...
@@ -117,6 +114,24 @@
$(
XSLT_INTDIR
)
\x
slt.obj
\
$(
XSLT_INTDIR
)
\x
sltutils.obj
# Static libxslt object files.
XSLT_OBJS_A
=
$(
XSLT_INTDIR_A
)
\a
ttributes.obj
\
$(
XSLT_INTDIR_A
)
\d
ocuments.obj
\
$(
XSLT_INTDIR_A
)
\e
xtensions.obj
\
$(
XSLT_INTDIR_A
)
\e
xtra.obj
\
$(
XSLT_INTDIR_A
)
\f
unctions.obj
\
$(
XSLT_INTDIR_A
)
\i
mports.obj
\
$(
XSLT_INTDIR_A
)
\k
eys.obj
\
$(
XSLT_INTDIR_A
)
\n
amespaces.obj
\
$(
XSLT_INTDIR_A
)
\n
umbers.obj
\
$(
XSLT_INTDIR_A
)
\p
attern.obj
\
$(
XSLT_INTDIR_A
)
\p
reproc.obj
\
$(
XSLT_INTDIR_A
)
\t
emplates.obj
\
$(
XSLT_INTDIR_A
)
\t
ransform.obj
\
$(
XSLT_INTDIR_A
)
\v
ariables.obj
\
$(
XSLT_INTDIR_A
)
\x
slt.obj
\
$(
XSLT_INTDIR_A
)
\x
sltutils.obj
# Libexslt object files.
EXSLT_OBJS
=
$(
EXSLT_INTDIR
)
\c
ommon.obj
\
$(
EXSLT_INTDIR
)
\d
ate.obj
\
...
...
@@ -128,7 +143,18 @@
$(
EXSLT_INTDIR
)
\s
trings.obj
\
$(
EXSLT_INTDIR
)
\d
ynamic.obj
# Static libexslt object files.
EXSLT_OBJS_A
=
$(
EXSLT_INTDIR_A
)
\c
ommon.obj
\
$(
EXSLT_INTDIR_A
)
\d
ate.obj
\
$(
EXSLT_INTDIR_A
)
\e
xslt.obj
\
$(
EXSLT_INTDIR_A
)
\f
unctions.obj
\
$(
EXSLT_INTDIR_A
)
\m
ath.obj
\
$(
EXSLT_INTDIR_A
)
\s
axon.obj
\
$(
EXSLT_INTDIR_A
)
\s
ets.obj
\
$(
EXSLT_INTDIR_A
)
\s
trings.obj
\
$(
EXSLT_INTDIR_A
)
\d
ynamic.obj
# Xsltproc and friends executables.
UTILS
=
$(
BINDIR
)
\x
sltproc.exe
...
...
@@ -131,6 +157,8 @@
# Xsltproc and friends executables.
UTILS
=
$(
BINDIR
)
\x
sltproc.exe
all
:
libxslt libexslt utils
all
:
libxslt libxslta libexslt libexslta utils
libxslt
:
$(BINDIR)
\$
(XSLT_SO)
...
...
@@ -136,3 +164,3 @@
libxslt
:
$(BINDIR)
\$
(XSLT_SO)
$(BINDIR)
\$
(XSLT_A)
libxslt
a
:
$(BINDIR)
\$
(XSLT_A)
...
...
@@ -138,7 +166,9 @@
libexslt
:
$(BINDIR)
\$
(EXSLT_SO) $(BINDIR)
\$
(EXSLT_A)
libexslt
:
$(BINDIR)
\$
(EXSLT_SO)
libexslta
:
$(BINDIR)
\$
(EXSLT_A)
utils
:
$(UTILS)
clean
:
if
exist
$(
XSLT_INTDIR
)
rmdir
/S /Q
$(
XSLT_INTDIR
)
...
...
@@ -140,6 +170,7 @@
utils
:
$(UTILS)
clean
:
if
exist
$(
XSLT_INTDIR
)
rmdir
/S /Q
$(
XSLT_INTDIR
)
if
exist
$(
XSLT_INTDIR_A
)
rmdir
/S /Q
$(
XSLT_INTDIR_A
)
if
exist
$(
EXSLT_INTDIR
)
rmdir
/S /Q
$(
EXSLT_INTDIR
)
...
...
@@ -145,4 +176,5 @@
if
exist
$(
EXSLT_INTDIR
)
rmdir
/S /Q
$(
EXSLT_INTDIR
)
if
exist
$(
EXSLT_INTDIR_A
)
rmdir
/S /Q
$(
EXSLT_INTDIR_A
)
if
exist
$(
UTILS_INTDIR
)
rmdir
/S /Q
$(
UTILS_INTDIR
)
if
exist
$(
BINDIR
)
rmdir
/S /Q
$(
BINDIR
)
...
...
@@ -181,7 +213,11 @@
$(XSLT_INTDIR)
:
if
not exist
$(
XSLT_INTDIR
)
mkdir
$(
XSLT_INTDIR
)
# Makes the static libxslt intermediate directory.
$(XSLT_INTDIR_A)
:
if
not exist
$(
XSLT_INTDIR_A
)
mkdir
$(
XSLT_INTDIR_A
)
# An implicit rule for libxslt compilation.
{$(XSLT_SRCDIR)}.c{$(XSLT_INTDIR)}.obj
::
$(
CC
)
$(
CFLAGS
)
/Fo
$(
XSLT_INTDIR
)
\
/c
$<
...
...
@@ -184,7 +220,12 @@
# An implicit rule for libxslt compilation.
{$(XSLT_SRCDIR)}.c{$(XSLT_INTDIR)}.obj
::
$(
CC
)
$(
CFLAGS
)
/Fo
$(
XSLT_INTDIR
)
\
/c
$<
# An implicit rule for static libxslt compilation.
{$(XSLT_SRCDIR)}.c{$(XSLT_INTDIR_A)}.obj
::
$(
CC
)
$(
CFLAGS
)
/D
"LIBXML_STATIC"
/D
"LIBXSLT_STATIC"
\
/Fo
$(
XSLT_INTDIR_A
)
\
/c
$<
# Compiles libxslt source. Uses the implicit rule for commands.
$(XSLT_OBJS)
:
$(XSLT_INTDIR)
...
...
@@ -188,6 +229,9 @@
# Compiles libxslt source. Uses the implicit rule for commands.
$(XSLT_OBJS)
:
$(XSLT_INTDIR)
# Compiles static libxslt source. Uses the implicit rule for commands.
$(XSLT_OBJS_A)
:
$(XSLT_INTDIR_A)
# Creates the export definition file (DEF) for libxslt.
$(XSLT_INTDIR)\$(XSLT_DEF)
:
$(XSLT_INTDIR) $(XSLT_DEF).src
$(
CPP
)
$(
CPPFLAGS
)
$(
XSLT_DEF
)
.src
>
$(
XSLT_INTDIR
)
\$
(
XSLT_DEF
)
...
...
@@ -197,6 +241,6 @@
$(
LD
)
$(
LDFLAGS
)
/DLL /DEF:
$(
XSLT_INTDIR
)
\$
(
XSLT_DEF
)
\
/VERSION:
$(
LIBXSLT_MAJOR_VERSION
)
.
$(
LIBXSLT_MINOR_VERSION
)
\
/IMPLIB:
$(
BINDIR
)
\$
(
XSLT_IMP
)
/OUT:
$(
BINDIR
)
\$
(
XSLT_SO
)
\
$(
XSLT_OBJS
)
$(
LIBS
)
$(
XSLT_OBJS
)
$(
LIBS
)
libxml2.lib
# Creates the libxslt archive.
...
...
@@ -201,6 +245,6 @@
# Creates the libxslt archive.
$(BINDIR)\$(XSLT_A)
:
$(BINDIR) $(XSLT_OBJS)
$(
AR
)
$(
ARFLAGS
)
/OUT:
$(
BINDIR
)
\$
(
XSLT_A
)
$(
XSLT_OBJS
)
$(BINDIR)\$(XSLT_A)
:
$(BINDIR) $(XSLT_OBJS
_A
)
$(
AR
)
$(
ARFLAGS
)
/OUT:
$(
BINDIR
)
\$
(
XSLT_A
)
$(
XSLT_OBJS
_A
)
...
...
@@ -205,6 +249,6 @@
# Creates the libxslt intermediate directory.
# Creates the lib
e
xslt intermediate directory.
$(EXSLT_INTDIR)
:
if
not exist
$(
EXSLT_INTDIR
)
mkdir
$(
EXSLT_INTDIR
)
...
...
@@ -208,5 +252,9 @@
$(EXSLT_INTDIR)
:
if
not exist
$(
EXSLT_INTDIR
)
mkdir
$(
EXSLT_INTDIR
)
# Creates the static libexslt intermediate directory.
$(EXSLT_INTDIR_A)
:
if
not exist
$(
EXSLT_INTDIR_A
)
mkdir
$(
EXSLT_INTDIR_A
)
# An implicit rule for libexslt compilation.
{$(EXSLT_SRCDIR)}.c{$(EXSLT_INTDIR)}.obj
::
...
...
@@ -211,7 +259,12 @@
# An implicit rule for libexslt compilation.
{$(EXSLT_SRCDIR)}.c{$(EXSLT_INTDIR)}.obj
::
$(
CC
)
/D /I
$(
EXSLT_SRCDIR
)
$(
CFLAGS
)
/Fo
$(
EXSLT_INTDIR
)
\
/c
$<
$(
CC
)
/I
$(
EXSLT_SRCDIR
)
$(
CFLAGS
)
/Fo
$(
EXSLT_INTDIR
)
\
/c
$<
# An implicit rule for static libexslt compilation.
{$(EXSLT_SRCDIR)}.c{$(EXSLT_INTDIR_A)}.obj
::
$(
CC
)
/D
"LIBXML_STATIC"
/D
"LIBXSLT_STATIC"
/D
"LIBEXSLT_STATIC"
\
/I
$(
EXSLT_SRCDIR
)
$(
CFLAGS
)
/Fo
$(
EXSLT_INTDIR_A
)
\
/c
$<
# Compiles libxslt source. Uses the implicit rule for commands.
$(EXSLT_OBJS)
:
$(EXSLT_INTDIR)
...
...
@@ -214,7 +267,10 @@
# Compiles libxslt source. Uses the implicit rule for commands.
$(EXSLT_OBJS)
:
$(EXSLT_INTDIR)
# Compiles libxslt source. Uses the implicit rule for commands.
$(EXSLT_OBJS_A)
:
$(EXSLT_INTDIR_A)
# Creates the export definition file (DEF) for libxslt.
$(EXSLT_INTDIR)\$(EXSLT_DEF)
:
$(EXSLT_INTDIR) $(EXSLT_DEF).src
$(
CPP
)
$(
CPPFLAGS
)
$(
EXSLT_DEF
)
.src
>
$(
EXSLT_INTDIR
)
\$
(
EXSLT_DEF
)
...
...
@@ -224,6 +280,6 @@
$(
LD
)
$(
LDFLAGS
)
/DLL /DEF:
$(
EXSLT_INTDIR
)
\$
(
EXSLT_DEF
)
\
/VERSION:
$(
LIBEXSLT_MAJOR_VERSION
)
.
$(
LIBEXSLT_MINOR_VERSION
)
\
/IMPLIB:
$(
BINDIR
)
\$
(
EXSLT_IMP
)
/OUT:
$(
BINDIR
)
\$
(
EXSLT_SO
)
\
$(
EXSLT_OBJS
)
$(
XSLT_IMP
)
$(
LIBS
)
$(
EXSLT_OBJS
)
$(
XSLT_IMP
)
$(
LIBS
)
libxml2.lib
# Creates the libexslt archive.
...
...
@@ -228,10 +284,10 @@
# Creates the libexslt archive.
$(BINDIR)\$(EXSLT_A)
:
$(BINDIR) $(EXSLT_OBJS)
$(
AR
)
$(
ARFLAGS
)
/OUT:
$(
BINDIR
)
\$
(
EXSLT_A
)
$(
EXSLT_OBJS
)
$(BINDIR)\$(EXSLT_A)
:
$(BINDIR) $(EXSLT_OBJS
_A
)
$(
AR
)
$(
ARFLAGS
)
/OUT:
$(
BINDIR
)
\$
(
EXSLT_A
)
$(
EXSLT_OBJS
_A
)
# Creates the utils intermediate directory.
$(UTILS_INTDIR)
:
if
not exist
$(
UTILS_INTDIR
)
mkdir
$(
UTILS_INTDIR
)
...
...
@@ -232,8 +288,9 @@
# Creates the utils intermediate directory.
$(UTILS_INTDIR)
:
if
not exist
$(
UTILS_INTDIR
)
mkdir
$(
UTILS_INTDIR
)
# An implicit rule for xmllint and friends.
# An implicit rule for xsltproc and friends.
APPLIBS
=
$(
LIBS
)
!if
"$(STATIC)"
==
"1"
...
...
@@ -239,2 +296,6 @@
!if
"$(STATIC)"
==
"1"
APPLIBS
=
$(
LIBS
)
libxml2_a.lib
!if
"$(WITH_ICONV)"
==
"1"
APPLIBS
=
$(
APPLIBS
)
iconv.lib
!
endif
{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe
:
...
...
@@ -240,4 +301,5 @@
{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe
:
$(
CC
)
/D
"LIBXSLT_STATIC"
/D
"LIBEXSLT_STATIC"
$(
CFLAGS
)
/Fo
$(
UTILS_INTDIR
)
\
/c
$<
$(
LD
)
$(
LDFLAGS
)
/OUT:
$@
$(
XSLT_A
)
$(
EXSLT_A
)
$(
LIBS
)
$(
UTILS_INTDIR
)
\$
(
<B
)
.obj
$(
CC
)
/D
"LIBXML_STATIC"
/D
"LIBXSLT_STATIC"
/D
"LIBEXSLT_STATIC"
\
$(
CFLAGS
)
/Fo
$(
UTILS_INTDIR
)
\
/c
$<
$(
LD
)
$(
LDFLAGS
)
/OUT:
$@
$(
XSLT_A
)
$(
EXSLT_A
)
$(
APPLIBS
)
$(
UTILS_INTDIR
)
\$
(
<B
)
.obj
!
else
...
...
@@ -243,3 +305,4 @@
!
else
APPLIBS
=
$(
LIBS
)
libxml2.lib
{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe
:
$(
CC
)
$(
CFLAGS
)
/Fo
$(
UTILS_INTDIR
)
\
/c
$<
...
...
@@ -244,6 +307,6 @@
{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe
:
$(
CC
)
$(
CFLAGS
)
/Fo
$(
UTILS_INTDIR
)
\
/c
$<
$(
LD
)
$(
LDFLAGS
)
/OUT:
$@
$(
XSLT_IMP
)
$(
EXSLT_IMP
)
$(
LIBS
)
$(
UTILS_INTDIR
)
\$
(
<B
)
.obj
$(
LD
)
$(
LDFLAGS
)
/OUT:
$@
$(
XSLT_IMP
)
$(
EXSLT_IMP
)
$(
APP
LIBS
)
$(
UTILS_INTDIR
)
\$
(
<B
)
.obj
!
endif
# Builds xsltproc and friends. Uses the implicit rule for commands.
...
...
@@ -247,7 +310,7 @@
!
endif
# Builds xsltproc and friends. Uses the implicit rule for commands.
$(UTILS)
:
$(UTILS_INTDIR) $(BINDIR) libxslt lib
e
xslt
$(UTILS)
:
$(UTILS_INTDIR) $(BINDIR) libxslt libxslt
a libexslt libexslta
# Source dependences should be autogenerated somehow here, but how to
# do it? I have no clue.
...
...
This diff is collapsed.
Click to expand it.
win32/configure.js
+
6
−
0
View file @
4dc9cbe0
...
...
@@ -42,6 +42,7 @@
var
withXsltDebug
=
true
;
var
withMemDebug
=
false
;
var
withDebugger
=
true
;
var
withIconv
=
true
;
/* Win32 build options. */
var
buildDebug
=
0
;
var
buildStatic
=
0
;
...
...
@@ -92,6 +93,7 @@
txt
+=
"
xslt_debug: Enable XSLT debbugging module (
"
+
(
withXsltDebug
?
"
yes
"
:
"
no
"
)
+
"
)
\n
"
;
txt
+=
"
mem_debug: Enable memory debugger (
"
+
(
withMemDebug
?
"
yes
"
:
"
no
"
)
+
"
)
\n
"
;
txt
+=
"
debugger: Enable external debugger support (
"
+
(
withDebugger
?
"
yes
"
:
"
no
"
)
+
"
)
\n
"
;
txt
+=
"
iconv: Use iconv library (
"
+
(
withIconv
?
"
yes
"
:
"
no
"
)
+
"
)
\n
"
;
txt
+=
"
\n
Win32 build options, default value given in parentheses:
\n\n
"
;
txt
+=
"
debug: Build unoptimised debug executables (
"
+
(
buildDebug
?
"
yes
"
:
"
no
"
)
+
"
)
\n
"
;
txt
+=
"
static: Link xsltproc statically to libxslt (
"
+
(
buildStatic
?
"
yes
"
:
"
no
"
)
+
"
)
\n
"
;
...
...
@@ -155,6 +157,7 @@
vf
.
WriteLine
(
"
WITH_DEBUG=
"
+
(
withXsltDebug
?
"
1
"
:
"
0
"
));
vf
.
WriteLine
(
"
WITH_MEM_DEBUG=
"
+
(
withMemDebug
?
"
1
"
:
"
0
"
));
vf
.
WriteLine
(
"
WITH_DEBUGGER=
"
+
(
withDebugger
?
"
1
"
:
"
0
"
));
vf
.
WriteLine
(
"
WITH_ICONV=
"
+
(
withIconv
?
"
1
"
:
"
0
"
));
vf
.
WriteLine
(
"
DEBUG=
"
+
(
buildDebug
?
"
1
"
:
"
0
"
));
vf
.
WriteLine
(
"
STATIC=
"
+
(
buildStatic
?
"
1
"
:
"
0
"
));
vf
.
WriteLine
(
"
PREFIX=
"
+
buildPrefix
);
...
...
@@ -297,6 +300,8 @@
withDebugger
=
strToBool
(
arg
.
substring
(
opt
.
length
+
1
,
arg
.
length
));
else
if
(
opt
==
"
debug
"
)
buildDebug
=
strToBool
(
arg
.
substring
(
opt
.
length
+
1
,
arg
.
length
));
else
if
(
opt
==
"
iconv
"
)
buildIconv
=
strToBool
(
arg
.
substring
(
opt
.
length
+
1
,
arg
.
length
));
else
if
(
opt
==
"
static
"
)
buildStatic
=
strToBool
(
arg
.
substring
(
opt
.
length
+
1
,
arg
.
length
));
else
if
(
opt
==
"
prefix
"
)
...
...
@@ -370,6 +375,7 @@
txtOut
+=
"
Debugging module:
"
+
boolToStr
(
withXsltDebug
)
+
"
\n
"
;
txtOut
+=
"
Memory debugging:
"
+
boolToStr
(
withMemDebug
)
+
"
\n
"
;
txtOut
+=
"
Debugger support:
"
+
boolToStr
(
withDebugger
)
+
"
\n
"
;
txtOut
+=
"
Use iconv:
"
+
boolToStr
(
withIconv
)
+
"
\n
"
;
txtOut
+=
"
\n
"
;
txtOut
+=
"
Win32 build configuration
\n
"
;
txtOut
+=
"
-------------------------
\n
"
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment