Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
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
Terraform modules
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
Johnny Cai
wine
Commits
99f90bb9
Commit
99f90bb9
authored
21 years ago
by
Jon Griffiths
Committed by
Alexandre Julliard
21 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update install script to match current build process.
Fix a warning in generated dll now we build with -DSTRICT.
parent
ca7e9ff1
No related branches found
Branches containing commit
Tags
wine-20001222
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/winedump/output.c
+57
-29
57 additions, 29 deletions
tools/winedump/output.c
with
57 additions
and
29 deletions
tools/winedump/output.c
+
57
−
29
View file @
99f90bb9
...
...
@@ -228,7 +228,7 @@ void output_c_preamble (void)
fprintf
(
cfile
,
"BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID "
"lpvReserved)
\n
{
\n\t
TRACE(
\"
(0x%%
08x
, %%ld, %%p)
\\
n
\"
,hinstDLL,"
"lpvReserved)
\n
{
\n\t
TRACE(
\"
(0x%%
p
, %%ld, %%p)
\\
n
\"
,hinstDLL,"
"fdwReason,lpvReserved);
\n\n\t
"
"if (fdwReason == DLL_PROCESS_ATTACH)
\n\t
{
\n\t\t
"
);
...
...
@@ -466,40 +466,68 @@ void output_install_script (void)
puts
(
"Creating install script"
);
fprintf
(
install_file
,
"#!/bin/bash
\n
# Generated from %s.dll by winedump.
\n\n
"
"if [ $# -ne 1 ] || [ ! -d $1 ] || [ ! -f"
" $1/AUTHORS ]; then
\n\t
[ $# -eq 1 ] && echo
\"
Invalid path
\"\n
"
"
\t
echo
\"
Usage: $0 wine-base-dir
\"\n\t
exit 1
\n
fi
\n\n
"
"if [ -d $1/dlls/%s ]; then
\n\t
echo
\"
DLL is already present
\"\n
"
"
\t
exit 1
\n
fi
\n\n
echo Adding DLL %s to Wine build tree...
\n
"
"echo
\n\n
mkdir $1/dlls/%s
\n
cp %s.spec $1/dlls/%s
\n
"
"cp %s_main.c $1/dlls/%s
\n
cp %s_dll.h $1/dlls/%s
\n
"
"cp Makefile.in $1/dlls/%s/Makefile.in
\n
echo Copied DLL files
\n\n
"
"cd $1
\n\n
sed '/dlls
\\
/"
"x11drv
\\
/Makefile/{G;s/$/dlls
\\
/%s
\\
/Makefile/;}' configure.ac"
" >t.tmp
\n
mv -f t.tmp configure.ac
\n
echo Patched configure.ac
\n\n
"
"sed '/^all:/{G;s/$/
\\
^%s.dll$(DLLEXT)
\\\\
/;}'"
" dlls/Makefile.in| tr ^
\\\\
t >t.tmp
\n
"
"sed '/BASEDIRS =/{G;s/$/
\\
^%s
\\\\
/;}' t.tmp | tr ^
\\\\
t >t.tmp2"
"
\n
sed '/Map symlink name /{G;s/$/^
\\
$(RM)
\\
$
\\
@
\\
&
\\
&
\\
$
\\
"
"(LN_S
\\
) %s
\\
/%s.dll
\\
$(DLLEXT)
\\
$
\\
@/;}' t.tmp2 | tr ^
\\\\
t"
" > t.tmp
\n
sed '/Map symlink name /{G;s/$/%s.dll
\\
$(DLLEXT): "
"%s
\\
/%s.dll
\\
$(DLLEXT)/;}' t.tmp > t.tmp2
\n
sed '/all dependencies"
"/{G;s/$/%s
\\
/__install__: %s.dll$(DLLEXT)/;}' t.tmp2 > t.tmp
\n
"
"sed '/dll dependencies/{G;s/$/%s: user32.dll
\\
$(DLLEXT) "
"kernel32.dll
\\
$(DLLEXT) ntdll.dll
\\
$(DLLEXT) advapi32.dll"
"
\\
$(DLLEXT)/;}' t.tmp > t.tmp2
\n\n
sed '/Map library name "
"/{G;s/$/%s
\\
/%s.dll
\\
$(DLLEXT): %s/;}' t.tmp2 >t.tmp
\n
"
"mv -f t.tmp dlls/Makefile.in
\n
rm -f t.tmp2
\n
echo Patched dlls/"
"Makefile.in
\n\n
echo
\n
echo ...done.
\n
echo Run
\\
'autoconf
\\
', "
"
\\
'./configure
\\
' then
\\
'make
\\
' to rebuild Wine
\n\n
"
,
"#!/bin/bash
\n
"
"# Generated from %s.dll by winedump.
\n\n
"
"if [ $# -ne 1 ] || [ ! -d $1 ] || [ ! -f $1/AUTHORS ]; then
\n
"
"
\t
[ $# -eq 1 ] && echo
\"
Invalid path
\"\n
"
"
\t
echo
\"
Usage: $0 wine-base-dir
\"\n
"
"
\t
exit 1
\n
"
"fi
\n\n
"
"if [ -d $1/dlls/%s ]; then
\n
"
"
\t
echo
\"
DLL is already present
\"\n
"
"
\t
exit 1
\n
"
"fi
\n\n
"
"echo Adding DLL %s to Wine build tree...
\n\n
"
"mkdir $1/dlls/%s
\n
"
"cp %s.spec $1/dlls/%s
\n
"
"cp %s_main.c $1/dlls/%s
\n
"
"cp %s_dll.h $1/dlls/%s
\n
"
"cp Makefile.in $1/dlls/%s/Makefile.in
\n
"
"echo Copied DLL files
\n\n
"
"cd $1
\n\n
"
"sed '/dlls
\\
/x11drv
\\
/Makefile/"
"{G;s/$/dlls
\\
/%s
\\
/Makefile/;}' configure.ac >t.tmp
\n
"
"mv -f t.tmp configure.ac
\n
"
"echo Patched configure.ac
\n\n
"
"sed '/^SYMLINKS =/{G;s/$/"
"
\\
^%s.dll$(DLLEXT)
\\\\
/;}' dlls/Makefile.in| tr ^
\\\\
t >t.tmp
\n
"
"sed '/BASEDIRS =/{G;s/$/
\\
^%s
\\\\
/;}' t.tmp | tr ^
\\\\
t >t.tmp2
\n
"
"sed '/Map symlink name /{G;s/$/^
\\
$(RM)
\\
$
\\
@
\\
&
\\
&
\\
$
\\
"
"(LN_S
\\
) %s
\\
/%s.dll
\\
$(DLLEXT)
\\
$
\\
@/;}' t.tmp2 | tr ^
\\\\
t"
" > t.tmp
\n
"
"sed '/Map symlink name /{G;s/$/%s.dll
\\
$(DLLEXT): "
"%s
\\
/%s.dll
\\
$(DLLEXT)/;}' t.tmp > t.tmp2
\n
"
"sed '/all dependencies/"
"{G;s/$/%s
\\
/__install__: %s.dll$(DLLEXT)/;}' t.tmp2 > t.tmp
\n
"
"sed '/dll dependencies/{G;s/$/%s: user32.dll
\\
$(DLLEXT) "
"kernel32.dll
\\
$(DLLEXT) ntdll.dll
\\
$(DLLEXT) advapi32.dll"
"
\\
$(DLLEXT)/;}' t.tmp > t.tmp2
\n
"
"sed '/^IMPORT_LIBS =/{G;s/$/
\\
^lib%s
\\\\
/;}' t.tmp2| tr ^
\\\\
t >t.tmp
\n
"
"sed '/^x11drv
\\
/x11drv.spec.def
\\
: $(WINEBUILD)/"
"{G;s/$/%s
\\
/%s.spec.def: $(WINEBUILD)/;}' t.tmp >t.tmp2
\n
"
"sed '/^$(DLLTOOL) -k -l $@ -d x11drv/"
"{G;s/$/lib%s.def: %s
\\
/%s.spec.def/;}' t.tmp2 >t.tmp
\n
"
"sed '/^$(DLLTOOL) -k -l $@ -d x11drv/{G;s/$/
\\
^$(RM) $@ && $(LN_S) "
"%s
\\
/%s.spec.def $@/;}' t.tmp| tr ^
\\\\
t >t.tmp2
\n
"
"sed '/^$(DLLTOOL) -k -l $@ -d x11drv/"
"{G;s/$/lib%s.a: %s
\\
/%s.spec.def/;}' t.tmp2 >t.tmp
\n
"
"sed '/^$(DLLTOOL) -k -l $@ -d x11drv/"
"{G;s/$/
\\
^$(DLLTOOL) -k -l $@ -d %s
\\
/%s.spec.def/;}' t.tmp| tr ^
\\\\
t >t.tmp2
\n
"
"sed '/Map library name /{G;s/$/%s
\\
/%s.dll
\\
$(DLLEXT): %s/;}' t.tmp2 >t.tmp
\n
"
"mv -f t.tmp dlls/Makefile.in
\n
"
"rm -f t.tmp2
\n
"
"echo Patched dlls/Makefile.in
\n\n
"
"echo Run
\\
'autoconf
\\
',
\\
'./configure
\\
' then
\\
'make
\\
' to rebuild Wine
\n\n
"
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
);
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
,
OUTPUT_DLL_NAME
);
fclose
(
install_file
);
snprintf
(
cmd
,
sizeof
(
cmd
),
"chmod a+x %s_install"
,
OUTPUT_DLL_NAME
);
...
...
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