Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
68990e0f
Commit
68990e0f
authored
Jul 13, 2006
by
Sidnei da Silva
Browse files
Options
Browse Files
Download
Plain Diff
> - Restore buildout into functioning >
parents
a971c5b2
7b4816a8
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
39 additions
and
29 deletions
+39
-29
inst/Makefile.win.in
inst/Makefile.win.in
+14
-1
inst/WinBuilders/bin/makezope.bat
inst/WinBuilders/bin/makezope.bat
+4
-0
inst/WinBuilders/etc/zope.iss.in
inst/WinBuilders/etc/zope.iss.in
+1
-1
inst/WinBuilders/mk/common.mk
inst/WinBuilders/mk/common.mk
+2
-2
inst/WinBuilders/mk/python.mk
inst/WinBuilders/mk/python.mk
+1
-1
inst/WinBuilders/mk/zope.mk
inst/WinBuilders/mk/zope.mk
+12
-22
inst/tar.py
inst/tar.py
+5
-2
No files found.
inst/Makefile.win.in
View file @
68990e0f
...
...
@@ -7,7 +7,8 @@ NAME=Zope
MAJOR_VERSION
=<<
ZOPE_MAJOR_VERSION
>>
MINOR_VERSION
=
<<ZOPE_MINOR_VERSION>>
RELEASE_TAG
=
<<VERSION_RELEASE_TAG>>
PACKAGE_NAME
=
$(NAME)
-
$(MAJOR_VERSION)
.
$(MINOR_VERSION)
-
$(RELEASE_TAG)
ZOPEVERSION
=
$(MAJOR_VERSION)
.
$(MINOR_VERSION)
-
$(RELEASE_TAG)
PACKAGE_NAME
=
$(NAME)
-
$(ZOPEVERSION)
PYTHON
=
"<<PYTHON>>"
TMPDIR
=
"<<TMP_DIR>>"
...
...
@@ -31,7 +32,9 @@ RMRF=deltree /y
CD
=
cd
XCOPY
=
xcopy /i /s /e /y
COPY
=
copy
MOVE
=
move
EXISTS
=
IF EXIST
NOT_EXISTS
=
IF NOT EXIST
default
:
build
# default: The default step (invoked when make is called without a target)
...
...
@@ -59,6 +62,16 @@ install: build version_txt
@
echo
Zope binaries installed successfully.
@
echo
Now run
'
$(PYTHON)
$(PREFIX)
\bin\mkzopeinstance.py'
$(BASE_DIR)/inst/tmp/$(PACKAGE_NAME).tgz
:
$(MAKE)
sdist
$(NOT_EXISTS)
inst
\t
mp
$(MKDIR)
inst
\t
mp
$(MOVE)
$(PACKAGE_NAME)
.tgz inst
\t
mp
# installer: Create the Zope Installer.
installer
:
$(BASE_DIR)/inst/tmp/$(PACKAGE_NAME).tgz
$(CD)
inst
&&
sh Winbuilders/buildout zope
ZOPEVERSION
=
$(ZOPEVERSION)
# inplace: Do an in-place build
inplace
:
$(MAKE)
install
PREFIX
=
"
$(BASE_DIR)
"
...
...
inst/WinBuilders/bin/makezope.bat
0 → 100644
View file @
68990e0f
cd
%
1
%
set
MAKEFLAGS
=
nmake
build
nmake
install
inst/WinBuilders/etc/zope.iss.in
View file @
68990e0f
...
...
@@ -33,7 +33,7 @@ Source:"bin\*.*"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs
Source:"doc\*.*"; DestDir: "{app}\doc"; Flags: ignoreversion recursesubdirs
Source:"lib\*.*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs
Source:"skel\*.*"; DestDir: "{app}\skel"; Flags: ignoreversion recursesubdirs
Source:"zopeskel\*.*"; DestDir: "{app}\zopeskel"; Flags: ignoreversion recursesubdirs
; these are required to be put into the bin directory for proper function of NT services
Source:"bin\Lib\site-packages\win32\PythonService.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
Source:"bin\Lib\site-packages\pywin32_system32\PyWinTypes24.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
...
...
inst/WinBuilders/mk/common.mk
View file @
68990e0f
...
...
@@ -39,8 +39,8 @@ TOUCH=touch
NMAKE
=
nmake
CSCRIPT
=
cscript
ECHO
=
echo
ISS_DIR
=
$(
CYGROOT)
/Progra~1/
Inno Setup 5
ISS_COMPILER
=
$(ISS_DIR)
/
Compil32.exe
ISS_DIR
=
$(
PROGRAMFILES)
\\
Inno Setup 5
ISS_COMPILER
=
$(ISS_DIR)
\\
Compil32.exe
# We need a version that understands cygwin paths, so /bin/
UNZIP
=
/bin/unzip
...
...
inst/WinBuilders/mk/python.mk
View file @
68990e0f
...
...
@@ -72,7 +72,7 @@ tmp:
$(ARB_PYSRCDIR)
:
tmp/$(PYDIRNAME).tgz
$(MKDIR)
"
$(SRC_DIR)
"
$(CD)
"
$(SRC_DIR)
"
&&
$(TAR)
x
v
zf ../tmp/
$(PYDIRNAME)
.tgz
$(CD)
"
$(SRC_DIR)
"
&&
$(TAR)
xzf ../tmp/
$(PYDIRNAME)
.tgz
$(TOUCH)
"
$(ARB_PYSRCDIR)
"
# unzip warns about .exe not being exactly a .zip, then succeeds in
...
...
inst/WinBuilders/mk/zope.mk
View file @
68990e0f
ZOPEVERSION
:
=
2.10.0-b1
ZOPEVERSION
=
2.10.0-b1
ZOPEDIRNAME
:=
Zope-
$(ZOPEVERSION)
ZOPE_REQUIRED_FILES
=
tmp/
$(ZOPEDIRNAME)
.tgz
REQUIRED_FILES
=
$(PYTHON_REQUIRED_FILES)
\
REQUIRED_FILES
=
$(PYTHON_REQUIRED_FILES)
\
$(ZOPE_REQUIRED_FILES)
clean_zope
:
$(RMRF)
src/
$(ZOPEDIRNAME)
install_zope
:
src/$(ZOPEDIRNAME)/inst
all
.py
\
install_zope
:
src/$(ZOPEDIRNAME)/inst
/configure
.py
\
install_python
\
$(BUILD_DIR)/lib/python/Zope2/version.txt
\
$(BUILD_DIR)/Zope-$(ZOPEVERSION)-win32.exe
...
...
@@ -40,27 +40,16 @@ $(BUILD_DIR)/Zope-$(ZOPEVERSION)-win32.exe: $(BUILD_DIR)/lib/python/Zope2/versio
# Build the Inno installer.
$(CD)
"$(BUILD_DIR)"
;
"$(ISS_COMPILER)"
/cc
"$(WIN_BUILD_DIR)\zope.iss"
MAKEZOPE
=
"
$(MAKEFILEDIR)
/bin/makezope.bat"
"
$(WIN_SRC_DIR)
\\
$(ZOPEDIRNAME)
"
# This builds Zope, then installs it into the build directory, then
# creates lib/python/Zope2/version.txt in the build directory.
#
# Yuck: for whatever reason, distutils refuses to allow an absolute
# path for the --home option, so this hardcodes "build" as the name of
# the build directory, and assumes "build" is a sibling of SRC_DIR.
#
# Yuck: the --no-compile option here has no effect: the install step
# creates oodles of unwanted .pyc files. They're removed by the
# $(BUILD_DIR)/Zope-$(ZOPEVERSION)-win32.exe target, though, before
# building the installer.
#
# Yuck: no matter what I pass to --install-headers, it throws away the
# last path component. We actually want to copy the Zope/ZODB headers
# into bin/Include. The "nonsense" at the end gets thrown away, and that
# smells like a bug. When it gets fixed, I suppose this will copy the
# headers to bin/Include/nonsense/.
$(BUILD_DIR)/lib/python/Zope2/version.txt
:
$(BUILD_DIR)/bin/python.exe
cd
"
$(SRC_DIR)
/
$(ZOPEDIRNAME)
"
&&
\
"
$<
"
install.py
install
--no-compile
--home
=
../../build
\
--install-headers
=
../../build/bin/Include/nonsense
"
$<
"
inst/configure.py
\
--prefix
=
"
$(WIN_BUILD_DIR)
"
\
--no-compile
$(MAKEZOPE)
echo
Zope
$(ZOPEVERSION)
>
$@
$(TOUCH)
$@
...
...
@@ -68,6 +57,7 @@ tmp/$(ZOPEDIRNAME).tgz:
$(TOUCH)
tmp/
$(ZOPEDIRNAME)
.tgz
# This merely unpacks the Zope tarball.
src/$(ZOPEDIRNAME)/inst
all
.py
:
tmp/$(ZOPEDIRNAME).tgz
src/$(ZOPEDIRNAME)/inst
/configure
.py
:
tmp/$(ZOPEDIRNAME).tgz
$(MKDIR)
"
$(SRC_DIR)
"
$(CD)
"
$(SRC_DIR)
"
&&
$(TAR)
xvzf ../tmp/
$(ZOPEDIRNAME)
.tgz
$(CD)
"
$(SRC_DIR)
"
&&
$(TAR)
xzf ../tmp/
$(ZOPEDIRNAME)
.tgz
$(TOUCH)
$@
inst/tar.py
View file @
68990e0f
...
...
@@ -19,7 +19,9 @@ from distutils import filelist
INCLUDES
=
tuple
(
'.*'
.
split
())
EXCLUDES
=
tuple
(
r""".*.svn\\ .*CVS\\ .*.tgz
.*makefile .*Makefile inst\\tmp\\.* .*build-base\\
.*makefile$ .*Makefile$
.*inst\\tmp\\.* .*inst\\src\\.*
.*build-base\\ .*build\\
.*~ .*.#.*"""
.
split
())
def
collect
(
top_dir
,
includes
=
INCLUDES
,
excludes
=
EXCLUDES
):
...
...
@@ -41,8 +43,9 @@ def collect(top_dir, includes=INCLUDES, excludes=EXCLUDES):
def
tar_it_up
(
dest
,
files
):
tar
=
tarfile
.
open
(
dest
,
mode
=
'w:gz'
)
basename
=
os
.
path
.
splitext
(
os
.
path
.
basename
(
dest
))[
0
]
for
fname
in
files
:
tar
.
add
(
fname
,
recursive
=
False
)
tar
.
add
(
fname
,
os
.
path
.
join
(
basename
,
fname
),
recursive
=
False
)
tar
.
close
()
def
main
(
options
,
args
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment