Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Appmonitor CLI client
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
IML Open Source
Appmonitor CLI client
Commits
5a66c40c
Commit
5a66c40c
authored
4 weeks ago
by
Hahn Axel (hahn)
Browse files
Options
Downloads
Patches
Plain Diff
update build env: use php 8.4.4; add build info
parent
9d3f06ec
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitignore
+1
-1
1 addition, 1 deletion
.gitignore
TODO.md
+2
-0
2 additions, 0 deletions
TODO.md
build.php
+39
-2
39 additions, 2 deletions
build.php
inc_vars.php
+4
-1
4 additions, 1 deletion
inc_vars.php
installer.php
+2
-2
2 additions, 2 deletions
installer.php
with
48 additions
and
6 deletions
.gitignore
+
1
−
1
View file @
5a66c40c
...
...
@@ -2,4 +2,4 @@ built_packages/
external/
build
src/include_checks.php
src/amcli
.php.tm
p
src/amcli
__build.ph
p
This diff is collapsed.
Click to expand it.
TODO.md
+
2
−
0
View file @
5a66c40c
...
...
@@ -12,6 +12,8 @@ was ich so sehe ...
⬜ Docker dev environment
⬜ IP Restriction
## Tests schreiben
✅ Test auf gesetzte Metadaten
...
...
This diff is collapsed.
Click to expand it.
build.php
+
39
−
2
View file @
5a66c40c
...
...
@@ -40,8 +40,16 @@ if(file_exists($OUTFILE)){
// ----------------------------------------------------------------------
_h1
(
"Prepare source"
);
$sBuildDate
=
date
(
"Y-m-d H:i:s"
);
$sBuildPhpcode
=
"
\$
AMCLI_BUILD_DATE=
\"
$sBuildDate
\"
;"
;
$datefile
=
str_replace
(
'.php'
,
'__build.php'
,
$INFILE
);
file_put_contents
(
$datefile
,
"<?php
// This file was generated by "
.
__FILE__
.
"
$sBuildPhpcode
"
);
$in
=
file_get_contents
(
$INFILE
);
$inccode
=
file_get_contents
(
$INCFILE
);
$inccode
=
$sBuildPhpcode
.
"
\n
"
.
file_get_contents
(
$INCFILE
);
$inccode
=
str_replace
(
"<?php"
,
""
,
$inccode
);
$tempcode
=
preg_replace
(
"#\/\/ ---MARK---INCLUDE-CHECKS---START---.*---MARK---INCLUDE-CHECKS---END#s"
,
"
$inccode
"
,
$in
);
...
...
@@ -68,11 +76,40 @@ _exec("$SPC \
_h1
(
"Test generated binary"
);
_exec
(
"file
\"
$OUTFILE
\"
"
);
_exec
(
"
\"
$OUTFILE
\"
--ini=../
src/simple
.ini"
);
_exec
(
"
\"
$OUTFILE
\"
--ini=../
tests/configs/metadata
.ini"
);
_h1
(
"Write architecture specific binary"
);
_exec
(
"cp
\"
$OUTFILE
\"
'
$OUTFILE2
'"
);
_h1
(
"Create readme"
);
$readme
=
"
{
$OUTFILE2
}
__README.md"
;
$versionSPC
=
system
(
"
$SPC
--version"
);
file_put_contents
(
$readme
,
"# Build infos
Date :
$sBuildDate
OS :
$myos
architecture:
$myarchitecture
File : "
.
basename
(
$OUTFILE2
)
.
"
## Versions
Used SPC :
$versionSPC
PHP version :
$php_version
PHP modules :
$php_libs
## Conmands
Download : `
$cmdSpcDownload
`
Build : `
$cmdSpcBuild
`
see https://os-docs.iml.unibe.ch/appmonitor-cli-client/
"
);
echo
"see
$readme
\n
"
;
// ----------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
inc_vars.php
+
4
−
1
View file @
5a66c40c
...
...
@@ -8,7 +8,7 @@ $dirPackages="built_packages";
// ---------- build with spc
// php version for spc
$php_version
=
"8.
3
"
;
$php_version
=
"8.
4.4
"
;
// extensions - see https://static-php.dev/en/guide/extensions.html
$php_libs
=
"mysqli,openssl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,sockets"
;
...
...
@@ -38,3 +38,6 @@ switch ($myos) {
$myosextension
=
$myos
==
"windows"
?
".exe"
:
""
;
$SPC
=
str_replace
(
'/'
,
DIRECTORY_SEPARATOR
,
"
$selfdir
/
$dirExternal
/bin/spc
$myosextension
"
);
$cmdSpcDownload
=
"
$SPC
download --no-interaction --with-php=
$php_version
--for-extensions
\"
$php_libs
\"
"
;
$cmdSpcBuild
=
"
$SPC
build --no-interaction --build-micro
\"
$php_libs
\"
"
;
This diff is collapsed.
Click to expand it.
installer.php
+
2
−
2
View file @
5a66c40c
...
...
@@ -171,10 +171,10 @@ if ($bDoBild){
_exec
(
"
$SPC
--no-interaction doctor"
);
echo
"💡 Hint: this can take a minute on a fresh install ...
\n
"
;
_exec
(
"
$SPC
download --no-interaction --with-php=
$php_version
--for-extensions
\"
$php_libs
\"
"
);
_exec
(
$cmdSpcDownload
);
echo
"💡 Hint: this can take 4 minutes on a fresh install or less on module changes ...
\n
"
;
_exec
(
"
$SPC
build --no-interaction --build-micro
\"
$php_libs
\"
"
);
_exec
(
$cmdSpcBuild
);
file_put_contents
(
"
$doneBuild
"
,
date
(
"Y-m-d H:i:s"
)
.
"
\n
$sDoneData
\n
"
);
}
else
{
_skip
(
"Micro already built - php
$php_version
- extensions
\"
$php_libs
\"
"
);
...
...
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