remove makefile, using only janet-pm commands to build. Add project.janet to examples sub-directory to build examples into executables

Author: rwtolbert

.gitignore

@@ -5,3 +5,10 @@ local_janet_deps/
 jfltk.so
 jfltk.dll
 .venv
+*.o
+*.obj
+
+# files that are generated
+jfltk/flags.janet
+jfltk/*.a
+jfltk/*.lib

Makefile

@@ -13,25 +13,44 @@
 (defdyn *cmakepath* "What cmake command to use")
 (defdyn *ninjapath* "What ninja command to use")
 
-(def- cfltk-lib
-  (if (= (os/which) :windows)
-    "cfltk2.lib"
-    "cfltk2.a"))
-
 (defn- cmake
   "Make a call to cmake."
   [& args]
+  (printf "cmake %j" args)
   (sh/exec (dyn *cmakepath* "cmake") ;args))
 
 (defn- update-submodules []
   (pm/git "submodule" "update" "--init" "--recursive"))
 
+(defn- lib-prefix []
+  (if (= (os/which) :windows)
+    ""
+    "lib"))
+
+(defn- lib-suffix []
+  (if (= (os/which) :windows)
+    ".lib"
+    ".a"))
+
+(def- cfltk-lib
+  (string (lib-prefix) "cfltk2" (lib-suffix)))
+
+(def- fltk-build-dir (string/format "_build/cfltk-build/fltk/lib"))
+(def- fltk-libs
+  (do
+    (var results @[])
+    (loop [item :in ["fltk" "fltk_gl" "fltk_forms" "fltk_images" "fltk_png" "fltk_jpeg" "fltk_z"]]
+      (array/push results (string (lib-prefix) item (lib-suffix))))
+    results))
+
 (def- cfltk-build-dir (string/format "_build/cfltk-build"))
+
 (def- fltk-flags @["-DFLTK_USE_SYSTEM_LIBJPEG=OFF"
                    "-DFLTK_USE_SYSTEM_LIBPNG=OFF"
                    "-DFLTK_USE_SYSTEM_ZLIB=OFF"
                    "-DFLTK_BUILD_FORMS=ON"])
-(def- cfltk-flags @["-B" cfltk-build-dir "-S" "cfltk" "-G" "Ninja" "-DCMAKE_BUILD_TYPE=Release" "-DCFLTK_USE_OPENGL=ON" "-DFLTK_BUILD_EXAMPLES=OFF"])
+(def- cfltk-flags @["-B" cfltk-build-dir "-S" "cfltk" "-G" "Ninja"
+                    "-DCMAKE_BUILD_TYPE=Release" "-DCFLTK_USE_OPENGL=ON" "-DFLTK_BUILD_EXAMPLES=OFF"])
 
 (when (= (os/which) :linux)
   (array/push fltk-flags "-DCFLTK_USE_FPIC=ON")
@@ -40,13 +59,30 @@
 (def- cmake-flags (array/concat cfltk-flags fltk-flags))
 (def- cmake-build-flags @["--build" cfltk-build-dir "--parallel" "--config" "Release"])
 
+(defn- copy-static-libs []
+  (sh/copy (string/format "%s/%s" cfltk-build-dir cfltk-lib) (string/format "./jfltk/%s" cfltk-lib))
+  (loop [fname :in fltk-libs]
+    (let [fullname (string/format "%s/%s" fltk-build-dir fname)
+          outname (string/format "./jfltk/%s" fname)]
+      (when (sh/exists? fullname)
+        (sh/copy fullname outname )))))
+
+(defn- clean-static-libs []
+  (loop [fname :in (sh/list-all-files "jfltk")]
+    (when (string/has-suffix? (lib-suffix) fname)
+      (sh/rm fname))))
+
 (defn build-cfltk []
   (unless (and (sh/exists? "cfltk") (sh/exists? "cfltk/fltk"))
     (update-submodules))
+  # remove old static libs, might be stale
+  (clean-static-libs)
   (unless (sh/exists? (string/format "%s/%s" cfltk-build-dir cfltk-lib))
     (unless (sh/exists? (string/format "%s/%s" cfltk-build-dir "build.ninja"))
       (cmake ;cmake-flags))
-    (cmake ;cmake-build-flags)))
+    (do (cmake ;cmake-build-flags)))
+  # copy static libs, assuming they have been built
+  (copy-static-libs))
 
 (set-command "cmake" *cmakepath*)
 (set-command "ninja" *ninjapath*)
@@ -63,28 +99,53 @@
 
 (def- fltk-config (path/join (os/cwd) (string/format "%s/fltk/fltk-config" cfltk-build-dir)))
 
-(def- windows-fltk-libs
+(def- windows-fltk-link-libs
   @[cfltk-lib-path "cfltk2.lib" fltk-lib-path
     "fltk.lib" "fltk_forms.lib" "fltk_gl.lib" "fltk_images.lib" "fltk_png.lib" "fltk_jpeg.lib" "fltk_z.lib"
     "glu32.lib" "opengl32.lib" "ole32.lib" "uuid.lib" "comctl32.lib" "gdi32.lib" "gdiplus.lib"
     "user32.lib" "shell32.lib" "comdlg32.lib" "ws2_32.lib" "winspool.lib"])
 
-(defn fltk-libs []
+(defn fltk-link-libs []
   (if (sh/exists? fltk-config)
     (if (not (= (os/which) :windows))
       (do
         (def out (sh/exec-slurp fltk-config "--use-gl" "--use-images" "--use-glut" "--use-forms" "--use-cairo" "--ldflags"))
         (string/split " " out))
       @[])
     (do (build-cfltk)
-        (fltk-libs))))
+        (fltk-link-libs))))
+
+(defn gen-lflags []
+  (if (= (os/which) :windows)
+    windows-fltk-link-libs
+    (array/join @[cfltk-lib-path "-lcfltk2"] (fltk-link-libs))))
 
 (defdyn *lflags* "Linker flags")
-(setdyn *lflags* (if (= (os/which) :windows)
-                   windows-fltk-libs
-                   (array/join @[cfltk-lib-path "-lcfltk2"] (fltk-libs))))
+(setdyn *lflags* (gen-lflags))
+
+(task "pre-build" ["build-cfltk" "create-flags"])
 
 (dofile "project.janet" :env (jpm-shim-env))
 
-(task "pre-build" ["build-cfltk"])
-(task "build-cfltk" [] (build-cfltk))
+(task "build-cfltk" []
+      (build-cfltk))
+
+# this creates a file in jfltk that can be used to get to the
+# platform specific linker flags to compile Janet+FLTK apps into
+# full executables. Have a look in "examples/" for an example
+(task "create-flags" []
+      (def flags (gen-lflags))
+      (var real-flags @[])
+      (loop [item :in flags]
+        (if (and (string/has-prefix? "-L" item) (not (string/find "/usr" item)))
+          (array/push real-flags '(get-libdir))
+          (array/push real-flags item)))
+      (def fname (string (os/cwd) "/jfltk/flags.janet"))
+      (def ofs (file/open fname :w))
+      (file/write ofs "(import spork/path)\n")
+      (file/write ofs "(defn get-libdir [] (string \"-L\" (path/abspath (path/dirname (dyn *current-file*)))))\n")
+      (file/write ofs (string/format "(def lflags %j)\n" real-flags))
+      (file/write ofs "(defn print-lflags [] (pp lflags))\n")
+      (file/close ofs))
+
+

bundle/init.janet

@@ -0,0 +1 @@
+@{:version "0.1.0" :jpm-dependencies @["spork"] :name "fltk-janet-examples" :description "Janet wrapper examples for FLTK" :author "Bob Tolbert" :dependencies @["spork"]}

examples/bundle/info.jdn

@@ -0,0 +1,5 @@
+(if (dyn :install-time-syspath)
+  (use @install-time-syspath/spork/declare-cc)
+  (use spork/declare-cc))
+
+(dofile "project.janet" :env (jpm-shim-env))

examples/bundle/init.janet

@@ -7,14 +7,14 @@
                     1)
     true 0))
 
+(defn main [&]
+  (def w (fl-window-new 100 100 400 300 "handler"))
+  (def f (fl-box-new 0 0 400 200 ""))
+  (def b (fl-button-new 160 210 80 40 "click me"))
+  (fl-window-end w)
+  (fl-window-show w)
 
-(def w (fl-window-new 100 100 400 300 "handler"))
-(def f (fl-box-new 0 0 400 200 ""))
-(def b (fl-button-new 160 210 80 40 "click me"))
-(fl-window-end w)
-(fl-window-show w)
+  (def cb (make-custom-callback clicker f))
 
-(def cb (make-custom-callback clicker f))
-
-(fl-button-handle b cb)
-(fl-run)
+  (fl-button-handle b cb)
+  (fl-run))

examples/handler.janet

@@ -6,8 +6,7 @@
 
 (var *main-window* nil)
 (var *console* nil)
-
-(def- *fc* (fl-native-file-chooser-new Fl-NativeFileChooserType-BrowseFile))
+(var *fc* nil)
 
 (var- default-filename nil)
 (defn- untitled-default []
@@ -111,6 +110,7 @@
   (fl-double-window-resizable *main-window* *main-window*)
   (fl-double-window-show *main-window*)
 
+  (set *fc* (fl-native-file-chooser-new Fl-NativeFileChooserType-BrowseFile))
   (fl-native-file-chooser-set-filter *fc* "Text\t*.txt\n")
   (fl-native-file-chooser-set-preset-file *fc* (untitled-default))
 

examples/native-filechooser.janet

@@ -0,0 +1,39 @@
+(import jfltk)
+
+(import spork/sh)
+(import spork/path)
+
+(setdyn :verbose true)
+
+(declare-project
+  :name "fltk-janet-examples"
+  :description ```Janet wrapper examples for FLTK```
+  :author ```Bob Tolbert```
+  :dependencies @["spork"]
+  :version "0.1.0")
+
+(def build-type (string (dyn *build-type* :release)))
+
+(setdyn *build-type* :release)
+
+# get lflags from jfltk module?
+(def- lflags jfltk/lflags)
+
+(def examples @["flex.janet"])
+
+(def- examples
+  (do
+    (var files @[])
+    (loop [fname :in (os/dir ".")]
+      (when (and (string/has-suffix? ".janet" fname) (not (= fname "project.janet")))
+        (array/push files fname)))
+    files))
+
+(setdyn :build-dir "_build")
+
+(loop [fname :in examples]
+  (declare-executable
+    :name (string/replace ".janet" "" fname)
+    :entry fname
+    :ldflags lflags
+    ))

examples/project.janet

@@ -1,2 +1,3 @@
 (import jfltk/constants :export true :prefix "")
-(import jfltk/widgets :export true :prefix "")
+(import jfltk/widgets :export true :prefix "")
+(import jfltk/flags :export true :prefix "")

jfltk/init.janet

@@ -1,3 +1,3 @@
-(use ../fltk-janet/init)
+#(use ../fltk-janet/init)
 
-(assert (= (hello) "Hello!"))
+#(assert (= (hello) "Hello!"))